我的主页

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -501,6 +501,10 @@
 		BC221FAA28C72FC100F99802 /* StyleInstrumentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC221FA928C72FC100F99802 /* StyleInstrumentView.xib */; };
 		BC221FAD28C736BD00F99802 /* MyCreateGroupBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC221FAC28C736BD00F99802 /* MyCreateGroupBottomView.m */; };
 		BC221FAF28C736C300F99802 /* MyCreateGroupBottomView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC221FAE28C736C300F99802 /* MyCreateGroupBottomView.xib */; };
+		BC221FB428C82F0500F99802 /* MinePageSortView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC221FB328C82F0500F99802 /* MinePageSortView.m */; };
+		BC221FB628C82F0C00F99802 /* MinePageSortView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC221FB528C82F0C00F99802 /* MinePageSortView.xib */; };
+		BC221FB928C8687300F99802 /* MusicSortView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC221FB828C8687300F99802 /* MusicSortView.m */; };
+		BC221FBB28C8687D00F99802 /* MusicSortView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC221FBA28C8687D00F99802 /* MusicSortView.xib */; };
 		BC2456E3286BE85A00D1F7C0 /* MineStyleEmptyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC2456E2286BE85A00D1F7C0 /* MineStyleEmptyView.m */; };
 		BC2456E5286BE86600D1F7C0 /* MineStyleEmptyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC2456E4286BE86600D1F7C0 /* MineStyleEmptyView.xib */; };
 		BC2456E9286BEF8000D1F7C0 /* MineEmptyGroupCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC2456E7286BEF8000D1F7C0 /* MineEmptyGroupCell.m */; };
@@ -1940,6 +1944,12 @@
 		BC221FAB28C736BD00F99802 /* MyCreateGroupBottomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyCreateGroupBottomView.h; sourceTree = "<group>"; };
 		BC221FAC28C736BD00F99802 /* MyCreateGroupBottomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyCreateGroupBottomView.m; sourceTree = "<group>"; };
 		BC221FAE28C736C300F99802 /* MyCreateGroupBottomView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyCreateGroupBottomView.xib; sourceTree = "<group>"; };
+		BC221FB228C82F0500F99802 /* MinePageSortView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MinePageSortView.h; sourceTree = "<group>"; };
+		BC221FB328C82F0500F99802 /* MinePageSortView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MinePageSortView.m; sourceTree = "<group>"; };
+		BC221FB528C82F0C00F99802 /* MinePageSortView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MinePageSortView.xib; sourceTree = "<group>"; };
+		BC221FB728C8687300F99802 /* MusicSortView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicSortView.h; sourceTree = "<group>"; };
+		BC221FB828C8687300F99802 /* MusicSortView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicSortView.m; sourceTree = "<group>"; };
+		BC221FBA28C8687D00F99802 /* MusicSortView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicSortView.xib; sourceTree = "<group>"; };
 		BC2456E1286BE85A00D1F7C0 /* MineStyleEmptyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineStyleEmptyView.h; sourceTree = "<group>"; };
 		BC2456E2286BE85A00D1F7C0 /* MineStyleEmptyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineStyleEmptyView.m; sourceTree = "<group>"; };
 		BC2456E4286BE86600D1F7C0 /* MineStyleEmptyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineStyleEmptyView.xib; sourceTree = "<group>"; };
@@ -3074,12 +3084,8 @@
 		275FA55C27F31A7400EB6240 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				275FA56027F31AE100EB6240 /* MinePageHeadView.h */,
-				275FA56127F31AE100EB6240 /* MinePageHeadView.m */,
-				275FA56327F31AEE00EB6240 /* MinePageHeadView.xib */,
-				BC58E7DB281B969B004B0893 /* MinePageTopView.h */,
-				BC58E7DC281B969B004B0893 /* MinePageTopView.m */,
-				BC58E7DE281B96A4004B0893 /* MinePageTopView.xib */,
+				BC221FB128C82EF400F99802 /* MinePageSort */,
+				BC221FB028C82BEA00F99802 /* HeadView */,
 				27D83F3A27F3EA5700062476 /* MinePageMienBodyView.h */,
 				27D83F3B27F3EA5700062476 /* MinePageMienBodyView.m */,
 				27D83F3D27F3EA8A00062476 /* MinePageCourseView.h */,
@@ -5021,6 +5027,32 @@
 			path = instrument;
 			sourceTree = "<group>";
 		};
+		BC221FB028C82BEA00F99802 /* HeadView */ = {
+			isa = PBXGroup;
+			children = (
+				275FA56027F31AE100EB6240 /* MinePageHeadView.h */,
+				275FA56127F31AE100EB6240 /* MinePageHeadView.m */,
+				275FA56327F31AEE00EB6240 /* MinePageHeadView.xib */,
+				BC58E7DB281B969B004B0893 /* MinePageTopView.h */,
+				BC58E7DC281B969B004B0893 /* MinePageTopView.m */,
+				BC58E7DE281B96A4004B0893 /* MinePageTopView.xib */,
+			);
+			path = HeadView;
+			sourceTree = "<group>";
+		};
+		BC221FB128C82EF400F99802 /* MinePageSort */ = {
+			isa = PBXGroup;
+			children = (
+				BC221FB228C82F0500F99802 /* MinePageSortView.h */,
+				BC221FB328C82F0500F99802 /* MinePageSortView.m */,
+				BC221FB528C82F0C00F99802 /* MinePageSortView.xib */,
+				BC221FB728C8687300F99802 /* MusicSortView.h */,
+				BC221FB828C8687300F99802 /* MusicSortView.m */,
+				BC221FBA28C8687D00F99802 /* MusicSortView.xib */,
+			);
+			path = MinePageSort;
+			sourceTree = "<group>";
+		};
 		BC2456FB286C434800D1F7C0 /* MidiPlayer */ = {
 			isa = PBXGroup;
 			children = (
@@ -7014,11 +7046,13 @@
 				BCC03F9F280579A500461B7C /* MyLiveCourseCell.xib in Resources */,
 				BCC583FF28A9FA8100BAB4CF /* cloud_animation_18.png in Resources */,
 				BCC583F628A9FA8100BAB4CF /* cloud_animation_20.png in Resources */,
+				BC221FB628C82F0C00F99802 /* MinePageSortView.xib in Resources */,
 				BCB6340627F6A2F000ACFDCF /* tick.wav in Resources */,
 				BCA1135228A242FD007FAFB9 /* HomeBannerView.xib in Resources */,
 				BC3673D628A606A500059721 /* live_animation_0.png in Resources */,
 				BC71D1FB2887FDD40010F14B /* img_28.png in Resources */,
 				BCA1135828A2439D007FAFB9 /* HomeBannerCell.xib in Resources */,
+				BC221FBB28C8687D00F99802 /* MusicSortView.xib in Resources */,
 				BC8B6E522856ED0600866917 /* UMCommonLog.bundle in Resources */,
 				BCA353EA2859A6FB00377661 /* MusicRoomHomeworkCell.xib in Resources */,
 				2755C07127EC7F21007D9070 /* ChatComplainBodyView.xib in Resources */,
@@ -7522,6 +7556,7 @@
 				277931E427E30FC20010E277 /* CALayer+Color.m in Sources */,
 				2779360C27E32BE50010E277 /* LoginViewController.m in Sources */,
 				27F9CB0E27EC5DF5003E0FE4 /* KSRCloudMediaManager.m in Sources */,
+				BC221FB928C8687300F99802 /* MusicSortView.m in Sources */,
 				BC4BCE7D2823B66000522C8B /* AddressDetailBodyView.m in Sources */,
 				275FA19D27E7246F00CFEA2E /* RCConnectionManager.m in Sources */,
 				BCC9F43727F69BD200647449 /* ControlDeviceNotifyMessage.m in Sources */,
@@ -7789,6 +7824,7 @@
 				275E3DFA27F46B340010EC30 /* KSBeautySettingView.m in Sources */,
 				BC41104528066EF200800BD9 /* EvaluateCourseBodyView.m in Sources */,
 				2779328E27E30FEB0010E277 /* MSSBrowseLoadingImageView.m in Sources */,
+				BC221FB428C82F0500F99802 /* MinePageSortView.m in Sources */,
 				2779335827E316DD0010E277 /* FastForwardView.m in Sources */,
 				277935DC27E326650010E277 /* RecordCheckManager.m in Sources */,
 				275E3DB327F45D380010EC30 /* KSLiveChatroomDownSeat.m in Sources */,

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

@@ -180,21 +180,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "64FC6080-AEF2-4AD5-9086-96799FBFC99C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleIntroduceCell.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "36"
-            endingLineNumber = "36"
-            landmarkName = "-configWithIntroduceMessage:modifyCallback:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/edit_course.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Mine/MinePage/minePage_next.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Mine/arrow_down.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Controller/MyMusicViewController.m

@@ -84,6 +84,7 @@
     self.categoryView.titleSelectedColor = HexRGB(0x333333);
     self.categoryView.titleColor = HexRGB(0x666666);
     self.categoryView.titleColorGradientEnabled = YES;
+    self.categoryView.backgroundColor = [UIColor whiteColor];
     
     JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
     lineView.indicatorColor = THEMECOLOR;
@@ -350,18 +351,44 @@
     if (!_searchView) {
         _searchView = [MyMusicSearchView shareInstance];
         MJWeakSelf;
-        [_searchView musicSearchAction:^(NSString * _Nonnull searchKey, BOOL isChooseSubject) {
-            if (isChooseSubject) {
-                [weakSelf searchSubject];
-            }
-            else {
-                [weakSelf evaluateSource:searchKey];
-            }
+        [_searchView musicSearchAction:^(MYMUSICSORT type, NSString * _Nullable searchKey) {
+            [weakSelf musicSearchAction:type searchKey:searchKey];
         }];
     }
     return _searchView;
 }
 
+
+- (void)musicSearchAction:(MYMUSICSORT)type searchKey:(NSString *)searchKey {
+    switch (type) {
+        case MYMUSICSORT_SUBJECT:
+        {
+            [self searchSubject];
+        }
+            break;
+        case MYMUSICSORT_SEARCH:
+        {
+            [self evaluateSource:searchKey];
+        }
+            break;
+        case MYMUSICSORT_UPLOAD:
+        {
+            [self uploadSong];
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)uploadSong {
+    NSString *url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/music-upload"];
+    KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+    webCtrl.url = url;
+    [self.navigationController pushViewController:webCtrl animated:YES];
+}
+
+
 - (void)searchSubject {
     if (self.subjectList.count) {
         NSMutableArray *nameArray = [NSMutableArray array];
@@ -372,25 +399,22 @@
         MJWeakSelf;
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             if (chooseIndex == 0) {
-                weakSelf.searchView.sortTitleLabel.text = @"声部";
+                weakSelf.searchView.subjectLabel.text = @"声部";
                 weakSelf.subjectIds = nil;
             }
             else {
                 NSDictionary *parm = self.subjectList[chooseIndex-1];
 
-                weakSelf.searchView.sortTitleLabel.text = returnValue;
+                weakSelf.searchView.subjectLabel.text = returnValue;
                 weakSelf.subjectIds = [parm stringValueForKey:@"subjectId"];
             }
-            weakSelf.searchView.arrowUp = NO;
             [weakSelf refreshSearchSource];
         } cancel:^{
-            self.searchView.arrowUp = NO;
         }];
         [picker showPicker];
     }
     else {
         [self MBPShow:@"无声部信息"];
-        self.searchView.arrowUp = NO;
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicMessageCell.h

@@ -8,13 +8,30 @@
 #import <UIKit/UIKit.h>
 #import "MusicMessageModel.h"
 
+
+typedef NS_ENUM(NSInteger, MUSICCELLTYPE) {
+    MUSICCELLTYPE_OWNER,        // 已拥有
+    MUSICCELLTYPE_ING,          // 已上架
+    MUSICCELLTYPE_CHECK,        // 审核中
+    MUSICCELLTYPE_CHECKFAILED,  // 审核失败
+    MUSICCELLTYPE_OUTSALE,      // 已下架
+};
+
+typedef NS_ENUM(NSInteger, ROWINDEX) {
+    ROWINDEX_TOP,
+    ROWINDEX_MIDDLE,
+    ROWINDEX_BOTTOM,
+    ROWINDEX_TOP_BOTTOM,
+};
+
+
 typedef void(^MusicOffCallback)(MusicMessageModel * _Nonnull songMessage);
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MusicMessageCell : UITableViewCell
 
-- (void)configWithMessage:(MusicMessageModel *)songMessage needOffButton:(BOOL)needOffButton callback:(MusicOffCallback)callback;
+- (void)configWithMessage:(MusicMessageModel *)songMessage rowIndex:(ROWINDEX)rowIndex cellType:(MUSICCELLTYPE)type callback:(MusicOffCallback)callback;
 
 @end
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicMessageCell.m

@@ -8,23 +8,28 @@
 #import "MusicMessageCell.h"
 
 @interface MusicMessageCell ()
+@property (weak, nonatomic) IBOutlet UIView *actionView;
+@property (weak, nonatomic) IBOutlet UIImageView *actionImage;
+@property (weak, nonatomic) IBOutlet UILabel *actionLabel;
+@property (weak, nonatomic) IBOutlet UIButton *actionButton;
 
-@property (weak, nonatomic) IBOutlet UILabel *songName;
-@property (weak, nonatomic) IBOutlet UILabel *songAuth;
-@property (weak, nonatomic) IBOutlet UIImageView *uploaderLogo;
-@property (weak, nonatomic) IBOutlet UILabel *uploaderName;
+@property (weak, nonatomic) IBOutlet UIView *checkView;
 
-@property (weak, nonatomic) IBOutlet UIView *tagView;
+@property (weak, nonatomic) IBOutlet UIImageView *playImage;
 
 @property (weak, nonatomic) IBOutlet UIView *typeView;
 @property (weak, nonatomic) IBOutlet UILabel *typeLabel;
 
-@property (weak, nonatomic) IBOutlet UIButton *downButton;
+@property (weak, nonatomic) IBOutlet UILabel *songName;
+@property (weak, nonatomic) IBOutlet UILabel *songAuth;
+
+@property (weak, nonatomic) IBOutlet UIView *bgView;
 
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *downButtonWidth;
+@property (weak, nonatomic) IBOutlet UIView *tagView;
 
 @property (weak, nonatomic) IBOutlet UIImageView *musicCover;
 
+@property (weak, nonatomic) IBOutlet UIView *lineView;
 @property (nonatomic, strong) MusicMessageModel *sourceModel;
 
 @property (nonatomic, copy) MusicOffCallback callback;
@@ -38,57 +43,129 @@
     self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
 
-- (void)configWithMessage:(MusicMessageModel *)songMessage needOffButton:(BOOL)needOffButton callback:(MusicOffCallback)callback {
+- (void)configWithMessage:(MusicMessageModel *)songMessage rowIndex:(ROWINDEX)rowIndex cellType:(MUSICCELLTYPE)type callback:(MusicOffCallback)callback {
     self.sourceModel = songMessage;
     if (callback) {
         self.callback = callback;
     }
-    if (needOffButton) {
-        self.downButton.hidden = NO;
-        self.downButtonWidth.constant = 48.0f;
-    }
-    else {
-        self.downButton.hidden = YES;
-        self.downButtonWidth.constant = 0.0f;
+    NSString *authString = @"";
+    switch (type) {
+        case MUSICCELLTYPE_OWNER:
+        {
+            self.playImage.hidden = NO;
+            self.checkView.hidden = YES;
+            self.actionView.hidden = YES;
+            authString = [NSString stringWithFormat:@"上传者：%@",songMessage.addName];
+        }
+            break;
+        case MUSICCELLTYPE_ING:
+        {
+            self.playImage.hidden = YES;
+            self.checkView.hidden = YES;
+            self.actionView.hidden = NO;
+            self.actionLabel.text = @"下架";
+            self.actionButton.userInteractionEnabled = YES;
+            self.actionLabel.textColor = HexRGB(0x008AE0);
+            [self.actionImage setImage:[UIImage imageNamed:@"unshelve_course"]];
+            authString = [NSString stringWithFormat:@"作曲：%@",songMessage.composer];
+        }
+            break;
+        case MUSICCELLTYPE_CHECK:
+        {
+            self.playImage.hidden = YES;
+            self.checkView.hidden = NO;
+            self.actionView.hidden = YES;
+            authString = [NSString stringWithFormat:@"作曲：%@",songMessage.composer];
+        }
+            break;
+        case MUSICCELLTYPE_CHECKFAILED:
+        {
+            self.playImage.hidden = YES;
+            self.checkView.hidden = YES;
+            self.actionView.hidden = NO;
+            self.actionLabel.text = @"修改";
+            self.actionButton.userInteractionEnabled = NO;
+            self.actionLabel.textColor = HexRGB(0xFF4E19);
+            [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];
+            authString = [NSString stringWithFormat:@"作曲：%@",songMessage.composer];
+        }
+            break;
+        case MUSICCELLTYPE_OUTSALE:
+        {
+            self.playImage.hidden = YES;
+            self.checkView.hidden = YES;
+            self.actionView.hidden = NO;
+            self.actionLabel.text = @"上架";
+            self.actionLabel.textColor = HexRGB(0xFF1919);
+            [self.actionImage setImage:[UIImage imageNamed:@"racking_course"]];
+            authString = [NSString stringWithFormat:@"作曲：%@",songMessage.composer];
+        }
+            break;
+        default:
+            break;
     }
     
     self.songName.text = [NSString returnNoNullStringWithString:songMessage.musicSheetName];
-    self.songAuth.text = [NSString returnNoNullStringWithString:songMessage.composer];
+    self.songAuth.text = authString;
     NSArray *tagArray = nil;
     if (![NSString isEmptyString:songMessage.subjectNames]) {
         tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
     }
     
-    NSString *owner = @"";
-    if ([NSString isEmptyString:songMessage.addName]) {
-        owner = [NSString stringWithFormat:@"游客%.0f",songMessage.userId];
-    }
-    else {
-        owner = songMessage.addName;
-    }
-    CGFloat maxWidth = [self getTagViewMaxWidth:owner];
+    CGFloat maxWidth = [self getTagViewMaxWidth:authString];
     [self configTagViewWithTagArray:tagArray maxWidth:maxWidth];
-    NSString *text = @"";
-    UIColor *textColor = [UIColor whiteColor];
+    
     if ([songMessage.chargeType isEqualToString:@"VIP"]) {
-        text = @"VIP";
-        textColor = HexRGB(0xFF6C00);
+        self.typeView.layer.borderColor = HexRGB(0xD38535).CGColor;
+        self.typeLabel.text = @"会员";
+        self.typeLabel.textColor = HexRGB(0xCD863E);
+        
     }
     else if ([songMessage.chargeType isEqualToString:@"CHARGE"]) {
-        text = @"点播";
-        textColor = HexRGB(0x0086ff);
+        self.typeView.layer.borderColor = HexRGB(0x50A2D8).CGColor;
+        self.typeLabel.text = @"点播";
+        self.typeLabel.textColor = HexRGB(0x3591CE);
     }
     else {
-        text = @"免费";
-        textColor = HexRGB(0xFF4700);
+        self.typeView.layer.borderColor = HexRGB(0x01B84F).CGColor;
+        self.typeLabel.text = @"免费";
+        self.typeLabel.textColor = HexRGB(0x01B84F);
     }
-    self.typeView.layer.borderColor = textColor.CGColor;
-    self.typeLabel.text = text;
-    self.typeLabel.textColor = textColor;
-    
-    self.uploaderName.text = [NSString returnNoNullStringWithString:owner];
-    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.addUserAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+
     [self.musicCover sd_setImageWithURL:[NSURL URLWithString:[songMessage.titleImg getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"music_logo"]];
+    
+    if (rowIndex == ROWINDEX_TOP) {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(10, 10)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = NO;
+    }
+    else if (rowIndex == ROWINDEX_BOTTOM) {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(10, 10)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = YES;
+    }
+    else if (rowIndex == ROWINDEX_TOP_BOTTOM) {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight|UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(10, 10)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = YES;
+    }
+    else {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(0, 0)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = NO;
+    }
 }
 
 - (IBAction)downAction:(id)sender {
@@ -98,8 +175,8 @@
 }
 
 - (CGFloat)getTagViewMaxWidth:(NSString *)teacherName {
-    CGFloat width = [self getStringWidthInLabel:teacherName font:[UIFont systemFontOfSize:12.0f]];
-    return kScreenWidth - 45  - 10 - 14 - width - 8;
+    CGFloat width = [self getStringWidthInLabel:teacherName font:[UIFont systemFontOfSize:10.0f]];
+    return KPortraitWidth - 70  - 28 - 12 - width - 7;
 }
 
 - (void)configTagViewWithTagArray:(NSArray *)tagArray maxWidth:(CGFloat)maxWidth {
@@ -108,14 +185,14 @@
     CGFloat xSpace = 0.0f;
     for (NSInteger i = 0; i < tagArray.count; i++) {
         NSString *tagString = tagArray[i];
-        CGFloat labelWidth = [self getStringWidthInLabel:tagString font:[UIFont systemFontOfSize:11.0f]];
-        CGFloat viewWidth = labelWidth + 8;
+        CGFloat labelWidth = [self getStringWidthInLabel:tagString font:[UIFont systemFontOfSize:10.0f]];
+        CGFloat viewWidth = labelWidth + 10;
         if (xSpace + viewWidth > width) {
             return;
         }
         CGRect frame = CGRectMake(xSpace, 0, viewWidth, 16.0f);
         [self createTagLabelViewWithName:tagString frame:frame];
-        xSpace += (viewWidth + 6);
+        xSpace += (viewWidth + 5);
     }
 }
 
@@ -126,14 +203,14 @@
 
 - (void)createTagLabelViewWithName:(NSString *)name frame:(CGRect)frame {
     UIView *bgView = [[UIView alloc] initWithFrame:frame];
-    bgView.backgroundColor = HexRGB(0xfff1de);
-    bgView.layer.cornerRadius = 4.0f;
+    bgView.backgroundColor = HexRGB(0xEFFBF9);
+    bgView.layer.cornerRadius = 8.0f;
     [self.tagView addSubview:bgView];
     
     UILabel *tagLabel = [[UILabel alloc] init];
     tagLabel.text = name;
-    tagLabel.textColor = HexRGB(0xff8c00);
-    tagLabel.font = [UIFont systemFontOfSize:11.0f];
+    tagLabel.textColor = HexRGB(0x2DC7AA);
+    tagLabel.font = [UIFont systemFontOfSize:10.0f];
     tagLabel.textAlignment = NSTextAlignmentCenter;
     [bgView addSubview:tagLabel];
     [tagLabel mas_makeConstraints:^(MASConstraintMaker *make) {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicMessageCell.xib

@@ -11,202 +11,200 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="127" id="KGk-i7-Jjw" customClass="MusicMessageCell">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="127"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="97" id="KGk-i7-Jjw" customClass="MusicMessageCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="127"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cZw-4y-TQf">
-                        <rect key="frame" x="14" y="0.0" width="347" height="115"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sfm-yS-y7g">
+                        <rect key="frame" x="14" y="0.0" width="347" height="80"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_logo" translatesAutoresizingMaskIntoConstraints="NO" id="0lv-Ag-D4i">
-                                <rect key="frame" x="11" y="10" width="40" height="40"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_logo" translatesAutoresizingMaskIntoConstraints="NO" id="7XK-Ip-4nf">
+                                <rect key="frame" x="11" y="16" width="48" height="48"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="40" id="HaO-0o-ca3"/>
-                                    <constraint firstAttribute="height" constant="40" id="R0u-G4-Oin"/>
+                                    <constraint firstAttribute="width" constant="48" id="XSb-vx-7KM"/>
+                                    <constraint firstAttribute="height" constant="48" id="tfw-OT-d72"/>
                                 </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="5"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="野蜂飞舞" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJH-dg-RUy">
-                                <rect key="frame" x="65" y="10" width="57.5" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="Gve-vx-wJ3"/>
-                                </constraints>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="野蜂飞舞" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dl5-Bm-goQ">
+                                <rect key="frame" x="105" y="16" width="57.5" height="17"/>
                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" 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="h4E-WH-mm7">
-                                <rect key="frame" x="65" y="30" width="144" height="17"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="17" id="kcp-93-i3W"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <color key="textColor" red="0.41568627450980389" green="0.41568627450980389" blue="0.41568627450980389" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fzK-g0-niQ">
-                                <rect key="frame" x="10" y="60" width="327" height="1"/>
-                                <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="作曲：尼古拉" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RpH-mG-bAV">
+                                <rect key="frame" x="70" y="47" width="74" height="17"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="RFv-Tp-TqA"/>
+                                    <constraint firstAttribute="height" constant="17" id="dN3-1e-oWe"/>
                                 </constraints>
-                            </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="mK4-YX-0Pz">
-                                <rect key="frame" x="18" y="69" width="20" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="20" id="3Hf-C3-vxt"/>
-                                    <constraint firstAttribute="height" constant="20" id="W1m-YG-1pi"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="10"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0yz-sV-N4h">
-                                <rect key="frame" x="45" y="71.5" width="37" height="15"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                <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="BlS-YZ-NoJ">
-                                <rect key="frame" x="90" y="71" width="247" height="16"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bva-Fc-J3U">
+                                <rect key="frame" x="151" y="47.5" width="184" height="16"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="16" id="ccv-lW-bnH"/>
+                                    <constraint firstAttribute="height" constant="16" id="IV6-At-KXT"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ODe-1A-3Tu">
-                                <rect key="frame" x="130.5" y="11" width="37" height="18"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0sg-Qr-0or">
+                                <rect key="frame" x="70" y="16" width="30" height="17"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="免费" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1BS-PD-N6Z">
-                                        <rect key="frame" x="7" y="1" width="22" height="14"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="14" id="4Jm-5C-kor"/>
-                                            <constraint firstAttribute="width" constant="22" id="9jS-1Q-7sk"/>
-                                        </constraints>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点播" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HfV-3f-zsp">
+                                        <rect key="frame" x="4.5" y="2.5" width="21" height="12"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                                        <color key="textColor" red="0.0" green="0.52549019607843139" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="textColor" red="0.20784313730000001" green="0.56862745100000001" blue="0.80784313730000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="1BS-PD-N6Z" secondAttribute="trailing" constant="8" id="0H3-gg-dQf"/>
-                                    <constraint firstItem="1BS-PD-N6Z" firstAttribute="top" secondItem="ODe-1A-3Tu" secondAttribute="top" constant="1" id="31C-Y1-9tx"/>
-                                    <constraint firstItem="1BS-PD-N6Z" firstAttribute="leading" secondItem="ODe-1A-3Tu" secondAttribute="leading" constant="7" id="XVn-H8-ied"/>
-                                    <constraint firstAttribute="bottom" secondItem="1BS-PD-N6Z" secondAttribute="bottom" constant="3" id="hJn-gQ-Q3Z"/>
+                                    <constraint firstItem="HfV-3f-zsp" firstAttribute="centerX" secondItem="0sg-Qr-0or" secondAttribute="centerX" id="Cyh-Tv-xvT"/>
+                                    <constraint firstItem="HfV-3f-zsp" firstAttribute="centerY" secondItem="0sg-Qr-0or" secondAttribute="centerY" id="EnN-d3-DmG"/>
+                                    <constraint firstAttribute="height" constant="17" id="OPA-je-PeY"/>
+                                    <constraint firstAttribute="width" constant="30" id="sG9-Hf-9Fa"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                        <color key="value" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                    </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                        <real key="value" value="1"/>
+                                        <real key="value" value="0.5"/>
                                     </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="9"/>
+                                        <real key="value" value="4"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" red="0.20784313730000001" green="0.56862745100000001" blue="0.80784313730000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xjJ-bd-oaS">
-                                <rect key="frame" x="271" y="19" width="48" height="22"/>
-                                <color key="backgroundColor" red="1" green="0.94509803921568625" blue="0.90588235294117647" alpha="1" colorSpace="calibratedRGB"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zm8-lb-ZEo">
+                                <rect key="frame" x="14" y="79.5" width="318" height="0.5"/>
+                                <color key="backgroundColor" red="0.90980392160000001" green="0.90980392160000001" blue="0.90980392160000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="OHp-oA-ADL"/>
-                                    <constraint firstAttribute="width" constant="48" id="oJd-iY-Yxf"/>
+                                    <constraint firstAttribute="height" constant="0.5" id="Zp6-Kh-Gqz"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                <state key="normal" title="下架">
-                                    <color key="titleColor" red="1" green="0.28627450980392155" blue="0.0078431372549019607" alpha="1" colorSpace="calibratedRGB"/>
-                                </state>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="11"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                                <connections>
-                                    <action selector="downAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Lzc-QD-eTu"/>
-                                </connections>
-                            </button>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_next" translatesAutoresizingMaskIntoConstraints="NO" id="aAa-9R-Y9r">
-                                <rect key="frame" x="328" y="25" width="11" height="10"/>
+                            </view>
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zQo-zL-Uo4">
+                                <rect key="frame" x="294" y="25" width="40" height="30"/>
+                                <subviews>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unshelve_course" translatesAutoresizingMaskIntoConstraints="NO" id="k1d-5k-fq8">
+                                        <rect key="frame" x="35" y="11.5" width="5" height="7"/>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下架" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n7K-6t-sdj">
+                                        <rect key="frame" x="0.0" y="6.5" width="29" height="17"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <color key="textColor" red="0.0" green="0.54117647058823526" blue="0.8784313725490196" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bqQ-uT-Twg">
+                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
+                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                        <connections>
+                                            <action selector="downAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="PJV-be-vxG"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="k1d-5k-fq8" firstAttribute="centerY" secondItem="zQo-zL-Uo4" secondAttribute="centerY" id="2il-Lb-yzR"/>
+                                    <constraint firstAttribute="width" constant="40" id="FdO-FK-hqC"/>
+                                    <constraint firstAttribute="bottom" secondItem="bqQ-uT-Twg" secondAttribute="bottom" id="Rkx-VQ-p9w"/>
+                                    <constraint firstItem="n7K-6t-sdj" firstAttribute="leading" secondItem="zQo-zL-Uo4" secondAttribute="leading" id="THn-ny-x6X"/>
+                                    <constraint firstItem="bqQ-uT-Twg" firstAttribute="top" secondItem="zQo-zL-Uo4" secondAttribute="top" id="fuz-vk-cHi"/>
+                                    <constraint firstItem="bqQ-uT-Twg" firstAttribute="leading" secondItem="zQo-zL-Uo4" secondAttribute="leading" id="jMW-Yi-0YL"/>
+                                    <constraint firstItem="k1d-5k-fq8" firstAttribute="leading" secondItem="n7K-6t-sdj" secondAttribute="trailing" constant="6" id="jUx-7I-wna"/>
+                                    <constraint firstAttribute="trailing" secondItem="k1d-5k-fq8" secondAttribute="trailing" id="jiw-Ou-Ywm"/>
+                                    <constraint firstAttribute="trailing" secondItem="bqQ-uT-Twg" secondAttribute="trailing" id="mjA-L6-hYT"/>
+                                    <constraint firstAttribute="height" constant="30" id="nSQ-8H-UUd"/>
+                                    <constraint firstItem="n7K-6t-sdj" firstAttribute="centerY" secondItem="zQo-zL-Uo4" secondAttribute="centerY" id="ukW-li-2V7"/>
+                                </constraints>
+                            </view>
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u0Q-lP-CEF">
+                                <rect key="frame" x="294" y="25" width="40" height="30"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="审核中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JNo-dV-jc9">
+                                        <rect key="frame" x="-1.5" y="6.5" width="43" height="17"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <color key="textColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="JNo-dV-jc9" firstAttribute="centerY" secondItem="u0Q-lP-CEF" secondAttribute="centerY" id="DRR-9m-zh4"/>
+                                    <constraint firstItem="JNo-dV-jc9" firstAttribute="centerX" secondItem="u0Q-lP-CEF" secondAttribute="centerX" id="fMa-S2-Q1J"/>
+                                </constraints>
+                            </view>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_music_play" translatesAutoresizingMaskIntoConstraints="NO" id="ZTx-7w-9HF">
+                                <rect key="frame" x="309" y="28" width="24" height="24"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="10" id="KRc-uf-ebr"/>
-                                    <constraint firstAttribute="width" constant="11" id="hWO-pZ-Lae"/>
+                                    <constraint firstAttribute="height" constant="24" id="9bC-D7-0U6"/>
+                                    <constraint firstAttribute="width" constant="24" id="Q3M-59-DBt"/>
                                 </constraints>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="xjJ-bd-oaS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ODe-1A-3Tu" secondAttribute="trailing" constant="5" id="4g9-Gs-pKb"/>
-                            <constraint firstItem="mK4-YX-0Pz" firstAttribute="top" secondItem="fzK-g0-niQ" secondAttribute="bottom" constant="8" id="9eW-K3-XB7"/>
-                            <constraint firstItem="0lv-Ag-D4i" firstAttribute="top" secondItem="cZw-4y-TQf" secondAttribute="top" constant="10" id="CMe-WT-se6"/>
-                            <constraint firstItem="aJH-dg-RUy" firstAttribute="top" secondItem="0lv-Ag-D4i" secondAttribute="top" id="DE1-7t-Vmj"/>
-                            <constraint firstItem="xjJ-bd-oaS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="h4E-WH-mm7" secondAttribute="trailing" constant="5" id="GAp-xw-Sh1"/>
-                            <constraint firstItem="ODe-1A-3Tu" firstAttribute="centerY" secondItem="aJH-dg-RUy" secondAttribute="centerY" id="Gkd-A2-N9g"/>
-                            <constraint firstItem="0yz-sV-N4h" firstAttribute="centerY" secondItem="mK4-YX-0Pz" secondAttribute="centerY" id="Guq-C9-8hI"/>
-                            <constraint firstItem="aAa-9R-Y9r" firstAttribute="centerY" secondItem="xjJ-bd-oaS" secondAttribute="centerY" id="KqN-Nu-Z31"/>
-                            <constraint firstItem="aAa-9R-Y9r" firstAttribute="leading" secondItem="xjJ-bd-oaS" secondAttribute="trailing" constant="9" id="Ngf-yX-WbK"/>
-                            <constraint firstItem="BlS-YZ-NoJ" firstAttribute="centerY" secondItem="0yz-sV-N4h" secondAttribute="centerY" id="TJJ-oh-KYP"/>
-                            <constraint firstItem="aJH-dg-RUy" firstAttribute="leading" secondItem="0lv-Ag-D4i" secondAttribute="trailing" constant="14" id="Vyn-zH-bGO"/>
-                            <constraint firstItem="0yz-sV-N4h" firstAttribute="leading" secondItem="mK4-YX-0Pz" secondAttribute="trailing" constant="7" id="YdV-iZ-O7n"/>
-                            <constraint firstAttribute="trailing" secondItem="BlS-YZ-NoJ" secondAttribute="trailing" constant="10" id="dA6-iK-Qpi"/>
-                            <constraint firstAttribute="trailing" secondItem="aAa-9R-Y9r" secondAttribute="trailing" constant="8" id="epG-FV-sZP"/>
-                            <constraint firstItem="mK4-YX-0Pz" firstAttribute="leading" secondItem="cZw-4y-TQf" secondAttribute="leading" constant="18" id="ffA-8Y-LSl"/>
-                            <constraint firstItem="0lv-Ag-D4i" firstAttribute="leading" secondItem="cZw-4y-TQf" secondAttribute="leading" constant="11" id="gqG-Im-aPq"/>
-                            <constraint firstItem="fzK-g0-niQ" firstAttribute="top" secondItem="0lv-Ag-D4i" secondAttribute="bottom" constant="10" id="ioT-0e-fEg"/>
-                            <constraint firstItem="fzK-g0-niQ" firstAttribute="leading" secondItem="cZw-4y-TQf" secondAttribute="leading" constant="10" id="iqH-mh-Olx"/>
-                            <constraint firstItem="h4E-WH-mm7" firstAttribute="top" secondItem="aJH-dg-RUy" secondAttribute="bottom" id="jmw-kx-7Nh"/>
-                            <constraint firstItem="ODe-1A-3Tu" firstAttribute="leading" secondItem="aJH-dg-RUy" secondAttribute="trailing" constant="8" id="nyK-o5-dFl"/>
-                            <constraint firstItem="h4E-WH-mm7" firstAttribute="leading" secondItem="aJH-dg-RUy" secondAttribute="leading" id="ouB-le-mDo"/>
-                            <constraint firstAttribute="trailing" secondItem="fzK-g0-niQ" secondAttribute="trailing" constant="10" id="upK-rl-hF6"/>
-                            <constraint firstItem="aAa-9R-Y9r" firstAttribute="top" secondItem="cZw-4y-TQf" secondAttribute="top" constant="25" id="xrl-1b-GEk"/>
-                            <constraint firstItem="BlS-YZ-NoJ" firstAttribute="leading" secondItem="0yz-sV-N4h" secondAttribute="trailing" constant="8" id="y6d-V8-4v8"/>
+                            <constraint firstAttribute="bottom" secondItem="Zm8-lb-ZEo" secondAttribute="bottom" id="7NW-eL-QbL"/>
+                            <constraint firstAttribute="trailing" secondItem="ZTx-7w-9HF" secondAttribute="trailing" constant="14" id="A59-EX-Pwf"/>
+                            <constraint firstItem="0sg-Qr-0or" firstAttribute="top" secondItem="7XK-Ip-4nf" secondAttribute="top" id="DcX-XV-hYx"/>
+                            <constraint firstAttribute="trailing" secondItem="bva-Fc-J3U" secondAttribute="trailing" constant="12" id="DqR-tq-mTT"/>
+                            <constraint firstItem="ZTx-7w-9HF" firstAttribute="centerY" secondItem="sfm-yS-y7g" secondAttribute="centerY" id="EOH-Nv-6oY"/>
+                            <constraint firstItem="0sg-Qr-0or" firstAttribute="leading" secondItem="7XK-Ip-4nf" secondAttribute="trailing" constant="11" id="GMO-Kg-sl1"/>
+                            <constraint firstItem="RpH-mG-bAV" firstAttribute="bottom" secondItem="7XK-Ip-4nf" secondAttribute="bottom" id="JEt-PA-q5v"/>
+                            <constraint firstItem="zQo-zL-Uo4" firstAttribute="centerY" secondItem="sfm-yS-y7g" secondAttribute="centerY" id="KR0-7u-JUu"/>
+                            <constraint firstItem="dl5-Bm-goQ" firstAttribute="centerY" secondItem="0sg-Qr-0or" secondAttribute="centerY" id="MlC-5R-Fe3"/>
+                            <constraint firstItem="RpH-mG-bAV" firstAttribute="leading" secondItem="7XK-Ip-4nf" secondAttribute="trailing" constant="11" id="Mp7-f0-ZO7"/>
+                            <constraint firstItem="zQo-zL-Uo4" firstAttribute="trailing" secondItem="u0Q-lP-CEF" secondAttribute="trailing" id="N32-3C-GRm"/>
+                            <constraint firstItem="7XK-Ip-4nf" firstAttribute="centerY" secondItem="sfm-yS-y7g" secondAttribute="centerY" id="gC0-wR-eHn"/>
+                            <constraint firstItem="bva-Fc-J3U" firstAttribute="centerY" secondItem="RpH-mG-bAV" secondAttribute="centerY" id="hFT-pZ-tvT"/>
+                            <constraint firstItem="Zm8-lb-ZEo" firstAttribute="leading" secondItem="sfm-yS-y7g" secondAttribute="leading" constant="14" id="lcg-jT-vjD"/>
+                            <constraint firstItem="zQo-zL-Uo4" firstAttribute="bottom" secondItem="u0Q-lP-CEF" secondAttribute="bottom" id="mdH-Xd-Com"/>
+                            <constraint firstAttribute="trailing" secondItem="Zm8-lb-ZEo" secondAttribute="trailing" constant="15" id="sCS-HL-jo0"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="dl5-Bm-goQ" secondAttribute="trailing" constant="10" id="sap-V4-hyb"/>
+                            <constraint firstItem="zQo-zL-Uo4" firstAttribute="leading" secondItem="u0Q-lP-CEF" secondAttribute="leading" id="tMw-2C-LzA"/>
+                            <constraint firstItem="zQo-zL-Uo4" firstAttribute="top" secondItem="u0Q-lP-CEF" secondAttribute="top" id="vFa-Bi-Li9"/>
+                            <constraint firstItem="7XK-Ip-4nf" firstAttribute="leading" secondItem="sfm-yS-y7g" secondAttribute="leading" constant="11" id="wWE-uW-GBd"/>
+                            <constraint firstAttribute="trailing" secondItem="zQo-zL-Uo4" secondAttribute="trailing" constant="13" id="yrx-j1-I2z"/>
+                            <constraint firstItem="bva-Fc-J3U" firstAttribute="leading" secondItem="RpH-mG-bAV" secondAttribute="trailing" constant="7" id="z8B-DS-OF4"/>
+                            <constraint firstItem="dl5-Bm-goQ" firstAttribute="leading" secondItem="0sg-Qr-0or" secondAttribute="trailing" constant="5" id="zmA-07-gQ9"/>
                         </constraints>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="10"/>
-                            </userDefinedRuntimeAttribute>
-                        </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="cZw-4y-TQf" secondAttribute="bottom" constant="12" id="EK8-Na-ooU"/>
-                    <constraint firstItem="cZw-4y-TQf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="WSf-7H-hP5"/>
-                    <constraint firstItem="cZw-4y-TQf" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="hkU-TE-jLc"/>
-                    <constraint firstAttribute="trailing" secondItem="cZw-4y-TQf" secondAttribute="trailing" constant="14" id="svV-TS-gRF"/>
+                    <constraint firstAttribute="bottom" secondItem="sfm-yS-y7g" secondAttribute="bottom" id="INi-fw-2g0"/>
+                    <constraint firstAttribute="trailing" secondItem="sfm-yS-y7g" secondAttribute="trailing" constant="14" id="a0J-am-NFp"/>
+                    <constraint firstItem="sfm-yS-y7g" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="an2-rN-j1M"/>
+                    <constraint firstItem="sfm-yS-y7g" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="l3K-Zf-Geu"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
-                <outlet property="downButton" destination="xjJ-bd-oaS" id="K7T-6E-5xd"/>
-                <outlet property="downButtonWidth" destination="oJd-iY-Yxf" id="Bw0-Zw-fYI"/>
-                <outlet property="musicCover" destination="0lv-Ag-D4i" id="OsU-V9-RGb"/>
-                <outlet property="songAuth" destination="h4E-WH-mm7" id="fSt-PK-Mfm"/>
-                <outlet property="songName" destination="aJH-dg-RUy" id="adP-vf-1mS"/>
-                <outlet property="tagView" destination="BlS-YZ-NoJ" id="PSZ-zu-Cnn"/>
-                <outlet property="typeLabel" destination="1BS-PD-N6Z" id="0bQ-Z6-NYL"/>
-                <outlet property="typeView" destination="ODe-1A-3Tu" id="PWH-kg-nV4"/>
-                <outlet property="uploaderLogo" destination="mK4-YX-0Pz" id="6NN-P0-dHF"/>
-                <outlet property="uploaderName" destination="0yz-sV-N4h" id="O80-Sf-Sa6"/>
+                <outlet property="actionButton" destination="bqQ-uT-Twg" id="r7b-Pn-aYl"/>
+                <outlet property="actionImage" destination="k1d-5k-fq8" id="vNf-9C-6uf"/>
+                <outlet property="actionLabel" destination="n7K-6t-sdj" id="jRc-i2-Qsa"/>
+                <outlet property="actionView" destination="zQo-zL-Uo4" id="5m3-tm-n8z"/>
+                <outlet property="bgView" destination="sfm-yS-y7g" id="u3u-6a-nVC"/>
+                <outlet property="checkView" destination="u0Q-lP-CEF" id="91t-YN-urD"/>
+                <outlet property="lineView" destination="Zm8-lb-ZEo" id="442-Ky-3TP"/>
+                <outlet property="musicCover" destination="7XK-Ip-4nf" id="eLL-Uh-TYx"/>
+                <outlet property="playImage" destination="ZTx-7w-9HF" id="b4d-YC-5QM"/>
+                <outlet property="songAuth" destination="RpH-mG-bAV" id="KhE-Bc-yps"/>
+                <outlet property="songName" destination="dl5-Bm-goQ" id="bec-Nd-9g2"/>
+                <outlet property="tagView" destination="bva-Fc-J3U" id="g6a-2C-DKl"/>
+                <outlet property="typeLabel" destination="HfV-3f-zsp" id="t0z-kF-06K"/>
+                <outlet property="typeView" destination="0sg-Qr-0or" id="bll-P9-6T7"/>
             </connections>
-            <point key="canvasLocation" x="131.15942028985509" y="101.45089285714285"/>
+            <point key="canvasLocation" x="131.15942028985509" y="91.071428571428569"/>
         </tableViewCell>
     </objects>
     <resources>
+        <image name="home_music_play" width="24" height="24"/>
         <image name="music_logo" width="41" height="40"/>
-        <image name="music_next" width="11" height="10"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="unshelve_course" width="5" height="7"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m

@@ -8,7 +8,6 @@
 #import "MyMusicBodyView.h"
 #import "MusicMessageModel.h"
 #import "MusicMessageCell.h"
-#import "MusicUploadView.h"
 #import "KSBaseWKWebViewController.h"
 #import "AuthDisplayView.h"
 #import "KSAccompanyWebViewController.h"
@@ -29,8 +28,6 @@
 
 @property (nonatomic, strong) NSString *audioStatus; // 审核状态(0:待审核;1:通过;2:未通过)
 
-@property (nonatomic, strong) MusicUploadView *uploadView;
-
 @property (nonatomic, assign) BOOL authStatus;
 
 @property (nonatomic, strong) AuthDisplayView *authView;
@@ -51,7 +48,7 @@
         self.tableView.dataSource = self;
         self.tableView.delegate = self;
         self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        self.tableView.rowHeight = 110;
+        self.tableView.rowHeight = 80;
         [self addSubview:self.tableView];
         
         UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
@@ -194,31 +191,17 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    CGFloat topHeight = self.selectIndex == 0 ? 10 : 60.0f;
+    CGFloat topHeight = 10.0f;
     self.tableView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
-    if (!_uploadView && self.selectIndex != 0) {
-        self.uploadView = [MusicUploadView shareInstance];
-        self.uploadView.frame = CGRectMake(0, 0, kScreenWidth, topHeight);
-        [self addSubview:self.uploadView];
-        MJWeakSelf;
-        [self.uploadView uploadAction:^(BOOL hasAuth) {
-            [weakSelf uploadSong];
-        }];
-        if (self.authStatus == NO) {
-            [self showAuthView];
-        }
-        else {
-            [self hideAuthView];
-        }
+    
+    if (self.authStatus == NO) {
+        [self showAuthView];
+    }
+    else {
+        [self hideAuthView];
     }
 }
 
-- (void)uploadSong {
-    NSString *url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/music-upload"];
-    KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-    webCtrl.url = url;
-    [self.naviController pushViewController:webCtrl animated:YES];
-}
 
 - (void)beginFirstRefresh {
     if (!self.isHeaderRefreshed) {
@@ -234,14 +217,43 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     MusicMessageModel *model = self.dataArray[indexPath.row];
     MusicMessageCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MusicMessageCell"];
-    BOOL needOffButton = self.selectIndex == 1 ? YES : NO;
+    MUSICCELLTYPE type = [self getCellType:self.selectIndex];
+    
+    ROWINDEX rowIndex = ROWINDEX_MIDDLE;
+    if (indexPath.row == 0 && self.dataArray.count == 1) {
+        rowIndex = ROWINDEX_TOP_BOTTOM;
+    }
+    else if (indexPath.row == 0) {
+        rowIndex = ROWINDEX_TOP;
+    }
+    else if (indexPath.row == self.dataArray.count - 1) {
+        rowIndex = ROWINDEX_BOTTOM;
+    }
     MJWeakSelf;
-    [cell configWithMessage:model needOffButton:needOffButton callback:^(MusicMessageModel * _Nonnull songMessage) {
+    [cell configWithMessage:model rowIndex:rowIndex cellType:type callback:^(MusicMessageModel * _Nonnull songMessage) {
         [weakSelf showAlert:songMessage];
     }];
     return cell;
 }
 
+- (MUSICCELLTYPE)getCellType:(NSInteger)index {
+    if (index == 0) {
+        return MUSICCELLTYPE_OWNER;
+    }
+    else if (index == 1) {
+        return MUSICCELLTYPE_ING;
+    }
+    else if (index == 2) {
+        return MUSICCELLTYPE_CHECK;
+    }
+    else if (index == 3) {
+        return MUSICCELLTYPE_CHECKFAILED;
+    }
+    else {
+        return MUSICCELLTYPE_OUTSALE;
+    }
+}
+
 - (void)showAlert:(MusicMessageModel *)songMessage {
     MJWeakSelf;
     self.alertView = [KSPublicAlertView shareInstanceWithTitle:@"提示" descMessage:@"确认下架该曲谱吗？" leftTitle:@"取消" rightTitle:@"确定" cancelAction:^{

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicSearchView.h

@@ -9,17 +9,23 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void(^MusicShareCallback)(NSString *searchKey, BOOL isChooseSubject);
+typedef NS_ENUM(NSInteger, MYMUSICSORT) {
+    MYMUSICSORT_SUBJECT,
+    MYMUSICSORT_SEARCH,
+    MYMUSICSORT_UPLOAD,
+};
+
+typedef void(^MusicSearchCallback)(MYMUSICSORT type, NSString * _Nullable searchKey);
+
 
 @interface MyMusicSearchView : UIView
 
-@property (weak, nonatomic) IBOutlet UILabel *sortTitleLabel;
+@property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
 
-@property (nonatomic, assign) BOOL arrowUp;
 
 + (instancetype)shareInstance;
 
-- (void)musicSearchAction:(MusicShareCallback)callback;
+- (void)musicSearchAction:(MusicSearchCallback)callback;
 
 @end
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicSearchView.m

@@ -9,20 +9,23 @@
 
 @interface MyMusicSearchView ()<UITextFieldDelegate>
 
-@property (nonatomic, copy) MusicShareCallback callback;
+@property (weak, nonatomic) IBOutlet UIView *subjectView;
 
-@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
+@property (nonatomic, copy) MusicSearchCallback callback;
 
 @property (weak, nonatomic) IBOutlet UITextField *searchField;
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *searchLeft;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *subjectViewWidth;
 @end
 
 @implementation MyMusicSearchView
 - (void)awakeFromNib {
     [super awakeFromNib];
-    self.arrowUp = NO;
     self.searchField.delegate = self;
-    self.searchField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入曲目名称" attributes:@{NSForegroundColorAttributeName:HexRGB(0x999999)}];
+    self.searchLeft.constant = 10.0f;
+    self.subjectViewWidth.constant = 82.0f;
 }
 
 + (instancetype)shareInstance {
@@ -30,40 +33,71 @@
     return view;
 }
 
-- (void)musicSearchAction:(MusicShareCallback)callback {
+- (void)musicSearchAction:(MusicSearchCallback)callback {
     if (callback) {
         self.callback = callback;
     }
 }
 
-- (void)setArrowUp:(BOOL)arrowUp {
-    _arrowUp = arrowUp;
-    NSString *imageName = arrowUp ? @"sort_up" : @"sort_down";
-    [_arrowImage setImage:[UIImage imageNamed:imageName]];
-}
 
 
-- (IBAction)buttonClickAction:(id)sender {
+- (IBAction)uploadAction:(id)sender {
     [self endEditing:YES];
     if (self.callback) {
-        self.callback(self.searchField.text, NO);
+        self.callback(MYMUSICSORT_UPLOAD, nil);
     }
 }
+
+- (IBAction)searchAction:(id)sender {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MYMUSICSORT_SEARCH, self.searchField.text);
+    }
+}
+
+
 - (IBAction)chooseSubjcetAction:(id)sender {
     [self endEditing:YES];
     if (self.callback) {
-        self.callback(self.searchField.text, YES);
+        self.callback(MYMUSICSORT_SUBJECT, nil);
     }
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
     [self endEditing:YES];
     if (self.callback) {
-        self.callback(textField.text,NO);
+        self.callback(MYMUSICSORT_SEARCH, textField.text);
     }
     return YES;
 }
 
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
+    [self subjectViewAnimation:YES];
+    return YES;
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    [self subjectViewAnimation:NO];
+}
+
+- (void)subjectViewAnimation:(BOOL)hidden {
+    [UIView animateWithDuration:0.3f animations:^{
+        if (hidden) {
+            self.subjectViewWidth.constant = 0.0f;
+            self.searchLeft.constant = 0.0f;
+        }
+        else {
+            self.subjectViewWidth.constant = 82.0f;
+            self.searchLeft.constant = 10.0f;
+        }
+        
+    }];
+}
+
++ (CGFloat)getViewHeight {
+    return 68.0f;
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicSearchView.xib

@@ -4,6 +4,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,106 +14,209 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uun-yR-wUh">
-                    <rect key="frame" x="67" y="7.5" width="333" height="35"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q44-DF-7de">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_green" translatesAutoresizingMaskIntoConstraints="NO" id="tjK-yc-EqR">
-                            <rect key="frame" x="12" y="10" width="15" height="15"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2g6-YB-uPh">
+                            <rect key="frame" x="315" y="11" width="85" height="28"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="minePage_next" translatesAutoresizingMaskIntoConstraints="NO" id="7t2-HK-sTH">
+                                    <rect key="frame" x="80" y="10.5" width="5" height="7"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="5" id="Hve-Bh-Hue"/>
+                                        <constraint firstAttribute="height" constant="7" id="QYa-UE-n7b"/>
+                                    </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="gRd-5U-8R8">
+                                    <rect key="frame" x="8" y="4" width="66" height="20"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                    <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CGM-9k-Nfc">
+                                    <rect key="frame" x="0.0" y="0.0" width="85" height="28"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <connections>
+                                        <action selector="uploadAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="6XQ-di-Xc3"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="15" id="2EC-rt-pef"/>
-                                <constraint firstAttribute="width" constant="15" id="Aqb-dy-vy4"/>
+                                <constraint firstItem="gRd-5U-8R8" firstAttribute="leading" secondItem="2g6-YB-uPh" secondAttribute="leading" constant="8" id="FQn-UU-O5x"/>
+                                <constraint firstItem="CGM-9k-Nfc" firstAttribute="leading" secondItem="2g6-YB-uPh" secondAttribute="leading" id="Pxb-F1-WhL"/>
+                                <constraint firstItem="7t2-HK-sTH" firstAttribute="leading" secondItem="gRd-5U-8R8" secondAttribute="trailing" constant="6" id="Qe7-Qr-Q14"/>
+                                <constraint firstAttribute="trailing" secondItem="CGM-9k-Nfc" secondAttribute="trailing" id="Sb7-Pv-ov2"/>
+                                <constraint firstAttribute="width" constant="85" id="WZQ-EY-uC4"/>
+                                <constraint firstItem="CGM-9k-Nfc" firstAttribute="top" secondItem="2g6-YB-uPh" secondAttribute="top" id="cPY-xi-hHO"/>
+                                <constraint firstAttribute="bottom" secondItem="CGM-9k-Nfc" secondAttribute="bottom" id="drY-j7-21d"/>
+                                <constraint firstItem="gRd-5U-8R8" firstAttribute="centerY" secondItem="2g6-YB-uPh" secondAttribute="centerY" id="heg-UB-6qr"/>
+                                <constraint firstAttribute="trailing" secondItem="7t2-HK-sTH" secondAttribute="trailing" id="oVk-M5-SBo"/>
+                                <constraint firstItem="7t2-HK-sTH" firstAttribute="centerY" secondItem="2g6-YB-uPh" secondAttribute="centerY" id="u8L-Rc-cBt"/>
+                                <constraint firstAttribute="height" constant="28" id="ubK-Ze-7Pc"/>
                             </constraints>
-                        </imageView>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入曲目名称" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ET6-Bq-mch">
-                            <rect key="frame" x="38" y="0.0" width="218" height="35"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <textInputTraits key="textInputTraits" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FQ7-Z9-vyz">
-                            <rect key="frame" x="266" y="4" width="56" height="27"/>
-                            <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gHT-ie-z1e">
+                            <rect key="frame" x="14" y="11" width="82" height="28"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="声部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mag-Fm-Weq">
+                                    <rect key="frame" x="13" y="5.5" width="49" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="bvu-ci-chR">
+                                    <rect key="frame" x="67" y="11.5" width="7" height="5"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="5" id="7da-ak-o9k"/>
+                                        <constraint firstAttribute="width" constant="7" id="F8i-tn-8zh"/>
+                                    </constraints>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHc-u8-6jc">
+                                    <rect key="frame" x="0.0" y="0.0" width="82" height="28"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <connections>
+                                        <action selector="chooseSubjcetAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="nnS-eq-IUu"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="56" id="Gi6-bs-LLL"/>
-                                <constraint firstAttribute="height" constant="27" id="Woe-BX-Waq"/>
+                                <constraint firstAttribute="width" constant="82" id="2cv-Ss-DCm"/>
+                                <constraint firstItem="bvu-ci-chR" firstAttribute="centerY" secondItem="gHT-ie-z1e" secondAttribute="centerY" id="2gO-oY-IUh"/>
+                                <constraint firstItem="mag-Fm-Weq" firstAttribute="centerY" secondItem="gHT-ie-z1e" secondAttribute="centerY" id="6iM-a0-4iK"/>
+                                <constraint firstAttribute="trailing" secondItem="eHc-u8-6jc" secondAttribute="trailing" id="Nxn-qB-yjL"/>
+                                <constraint firstItem="mag-Fm-Weq" firstAttribute="leading" secondItem="gHT-ie-z1e" secondAttribute="leading" constant="13" id="Pfr-wT-Hvu"/>
+                                <constraint firstItem="bvu-ci-chR" firstAttribute="leading" secondItem="mag-Fm-Weq" secondAttribute="trailing" constant="5" id="Pw8-HM-6I9"/>
+                                <constraint firstAttribute="bottom" secondItem="eHc-u8-6jc" secondAttribute="bottom" id="V5l-Cu-cYx"/>
+                                <constraint firstAttribute="trailing" secondItem="bvu-ci-chR" secondAttribute="trailing" constant="8" id="Yhn-bR-sKw"/>
+                                <constraint firstItem="eHc-u8-6jc" firstAttribute="leading" secondItem="gHT-ie-z1e" secondAttribute="leading" id="mhN-w0-KKJ"/>
+                                <constraint firstAttribute="height" constant="28" id="zFx-g1-ImI"/>
+                                <constraint firstItem="eHc-u8-6jc" firstAttribute="top" secondItem="gHT-ie-z1e" secondAttribute="top" id="zQ6-Av-6Ra"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" title="搜索"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="13.5"/>
+                                    <real key="value" value="14"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iru-Ki-YCO">
+                            <rect key="frame" x="106" y="11" width="197" height="28"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_green" translatesAutoresizingMaskIntoConstraints="NO" id="gBz-Mo-2aJ">
+                                    <rect key="frame" x="8" y="6" width="15" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="15" id="I3T-KV-IqN"/>
+                                        <constraint firstAttribute="height" constant="16" id="wDX-Dl-hzV"/>
+                                    </constraints>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j7p-sQ-GlH">
+                                    <rect key="frame" x="160" y="1" width="37" height="26"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="37" id="MqV-Eg-09o"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <state key="normal" title="搜">
+                                        <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                    </state>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                            <real key="value" value="13"/>
+                                        </userDefinedRuntimeAttribute>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="VSm-ld-IjS"/>
+                                    </connections>
+                                </button>
+                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="曲目" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4Tn-Xi-Lsb">
+                                    <rect key="frame" x="34" y="0.0" width="124" height="28"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <textInputTraits key="textInputTraits" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
+                                </textField>
+                            </subviews>
+                            <color key="backgroundColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="28" id="1uS-il-IYq"/>
+                                <constraint firstItem="gBz-Mo-2aJ" firstAttribute="leading" secondItem="iru-Ki-YCO" secondAttribute="leading" constant="8" id="AqK-YC-SDO"/>
+                                <constraint firstAttribute="bottom" secondItem="4Tn-Xi-Lsb" secondAttribute="bottom" id="MHp-uV-7pe"/>
+                                <constraint firstItem="j7p-sQ-GlH" firstAttribute="top" secondItem="iru-Ki-YCO" secondAttribute="top" constant="1" id="QF4-1i-dQB"/>
+                                <constraint firstItem="gBz-Mo-2aJ" firstAttribute="centerY" secondItem="iru-Ki-YCO" secondAttribute="centerY" id="XMv-AD-GNY"/>
+                                <constraint firstAttribute="trailing" secondItem="j7p-sQ-GlH" secondAttribute="trailing" id="ZjY-qY-uz6"/>
+                                <constraint firstItem="4Tn-Xi-Lsb" firstAttribute="leading" secondItem="gBz-Mo-2aJ" secondAttribute="trailing" constant="11" id="dum-i4-LSP"/>
+                                <constraint firstAttribute="bottom" secondItem="j7p-sQ-GlH" secondAttribute="bottom" constant="1" id="fxO-6P-skq"/>
+                                <constraint firstItem="j7p-sQ-GlH" firstAttribute="leading" secondItem="4Tn-Xi-Lsb" secondAttribute="trailing" constant="2" id="i9U-oI-YCY"/>
+                                <constraint firstItem="4Tn-Xi-Lsb" firstAttribute="top" secondItem="iru-Ki-YCO" secondAttribute="top" id="v4L-Gr-J08"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="14"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="buttonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="yai-so-4bW"/>
-                            </connections>
-                        </button>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n01-JG-yCK">
+                            <rect key="frame" x="0.0" y="49" width="414" height="1"/>
+                            <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="07p-9D-aGe"/>
+                            </constraints>
+                        </view>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="ET6-Bq-mch" firstAttribute="top" secondItem="Uun-yR-wUh" secondAttribute="top" id="1vY-BN-cli"/>
-                        <constraint firstItem="FQ7-Z9-vyz" firstAttribute="leading" secondItem="ET6-Bq-mch" secondAttribute="trailing" constant="10" id="6mU-7g-8R8"/>
-                        <constraint firstAttribute="trailing" secondItem="FQ7-Z9-vyz" secondAttribute="trailing" constant="11" id="AfE-t9-cP7"/>
-                        <constraint firstAttribute="height" constant="35" id="ERv-55-Puq"/>
-                        <constraint firstItem="tjK-yc-EqR" firstAttribute="centerY" secondItem="Uun-yR-wUh" secondAttribute="centerY" id="daC-86-7YO"/>
-                        <constraint firstItem="FQ7-Z9-vyz" firstAttribute="centerY" secondItem="Uun-yR-wUh" secondAttribute="centerY" id="egX-kd-p79"/>
-                        <constraint firstAttribute="bottom" secondItem="ET6-Bq-mch" secondAttribute="bottom" id="iWQ-hW-3he"/>
-                        <constraint firstItem="tjK-yc-EqR" firstAttribute="leading" secondItem="Uun-yR-wUh" secondAttribute="leading" constant="12" id="l8O-gv-UjC"/>
-                        <constraint firstItem="ET6-Bq-mch" firstAttribute="leading" secondItem="tjK-yc-EqR" secondAttribute="trailing" constant="11" id="vBj-Tz-fFc"/>
+                        <constraint firstItem="iru-Ki-YCO" firstAttribute="leading" secondItem="gHT-ie-z1e" secondAttribute="trailing" constant="10" id="1hp-NB-FNS"/>
+                        <constraint firstItem="n01-JG-yCK" firstAttribute="leading" secondItem="q44-DF-7de" secondAttribute="leading" id="CaH-OA-Swk"/>
+                        <constraint firstAttribute="trailing" secondItem="n01-JG-yCK" secondAttribute="trailing" id="FYh-TZ-4f1"/>
+                        <constraint firstAttribute="bottom" secondItem="n01-JG-yCK" secondAttribute="bottom" id="T0j-9S-3QR"/>
+                        <constraint firstItem="2g6-YB-uPh" firstAttribute="centerY" secondItem="q44-DF-7de" secondAttribute="centerY" id="WwF-GY-FFM"/>
+                        <constraint firstItem="gHT-ie-z1e" firstAttribute="centerY" secondItem="q44-DF-7de" secondAttribute="centerY" id="eOs-fC-b3G"/>
+                        <constraint firstItem="iru-Ki-YCO" firstAttribute="centerY" secondItem="gHT-ie-z1e" secondAttribute="centerY" id="mED-eP-Xek"/>
+                        <constraint firstItem="2g6-YB-uPh" firstAttribute="leading" secondItem="iru-Ki-YCO" secondAttribute="trailing" constant="12" id="rgH-Pb-caW"/>
+                        <constraint firstAttribute="trailing" secondItem="2g6-YB-uPh" secondAttribute="trailing" constant="14" id="s10-09-be1"/>
+                        <constraint firstItem="gHT-ie-z1e" firstAttribute="leading" secondItem="q44-DF-7de" secondAttribute="leading" constant="14" id="ubb-71-YYl"/>
                     </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="17.5"/>
-                        </userDefinedRuntimeAttribute>
-                    </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="KpS-Cg-2zY">
-                    <rect key="frame" x="14" y="15" width="29" height="20"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="20" id="Dvl-aQ-09K"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="ixh-e8-4DX">
-                    <rect key="frame" x="49" y="22" width="8" height="6"/>
-                </imageView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zsS-Hg-jho">
-                    <rect key="frame" x="14" y="8" width="43" height="34"/>
-                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <connections>
-                        <action selector="chooseSubjcetAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="VzP-Up-8ae"/>
-                    </connections>
-                </button>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="Uun-yR-wUh" firstAttribute="leading" secondItem="ixh-e8-4DX" secondAttribute="trailing" constant="10" id="0oR-4H-k5c"/>
-                <constraint firstItem="ixh-e8-4DX" firstAttribute="centerY" secondItem="zsS-Hg-jho" secondAttribute="centerY" id="2Ze-Fb-t8G"/>
-                <constraint firstItem="Uun-yR-wUh" firstAttribute="centerY" secondItem="KpS-Cg-2zY" secondAttribute="centerY" id="7sS-eE-MmP"/>
-                <constraint firstItem="KpS-Cg-2zY" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="9D6-OS-kQT"/>
-                <constraint firstItem="KpS-Cg-2zY" firstAttribute="leading" secondItem="zsS-Hg-jho" secondAttribute="leading" id="AS0-Rg-XDO"/>
-                <constraint firstItem="KpS-Cg-2zY" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="Hm6-CP-js4"/>
-                <constraint firstAttribute="trailing" secondItem="Uun-yR-wUh" secondAttribute="trailing" constant="14" id="MEv-Gn-l3a"/>
-                <constraint firstItem="ixh-e8-4DX" firstAttribute="trailing" secondItem="zsS-Hg-jho" secondAttribute="trailing" id="QUN-xT-MyL"/>
-                <constraint firstItem="ixh-e8-4DX" firstAttribute="leading" secondItem="KpS-Cg-2zY" secondAttribute="trailing" constant="6" id="WEO-rE-ZPt"/>
-                <constraint firstItem="ixh-e8-4DX" firstAttribute="centerY" secondItem="KpS-Cg-2zY" secondAttribute="centerY" id="bct-B0-5xh"/>
+                <constraint firstItem="q44-DF-7de" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="byP-1u-xC7"/>
+                <constraint firstAttribute="trailing" secondItem="q44-DF-7de" secondAttribute="trailing" id="gLm-9f-WJW"/>
+                <constraint firstItem="q44-DF-7de" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="qqk-b0-3Bh"/>
+                <constraint firstAttribute="bottom" secondItem="q44-DF-7de" secondAttribute="bottom" id="vpl-F7-Hwn"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="arrowImage" destination="ixh-e8-4DX" id="jDo-hq-MEI"/>
-                <outlet property="searchField" destination="ET6-Bq-mch" id="5XY-xU-Vzp"/>
-                <outlet property="sortTitleLabel" destination="KpS-Cg-2zY" id="Ema-iJ-DOF"/>
+                <outlet property="searchField" destination="4Tn-Xi-Lsb" id="10U-Pk-G6G"/>
+                <outlet property="searchLeft" destination="1hp-NB-FNS" id="yWR-bj-Ia7"/>
+                <outlet property="subjectLabel" destination="mag-Fm-Weq" id="pat-Hc-3Mb"/>
+                <outlet property="subjectView" destination="gHT-ie-z1e" id="9U0-RN-13V"/>
+                <outlet property="subjectViewWidth" destination="2cv-Ss-DCm" id="RQO-ML-q8X"/>
             </connections>
-            <point key="canvasLocation" x="137.68115942028987" y="-16.40625"/>
+            <point key="canvasLocation" x="137.68115942028987" y="-16.741071428571427"/>
         </view>
     </objects>
     <resources>
+        <image name="arrow_down" width="7" height="5"/>
+        <image name="minePage_next" width="5" height="7"/>
         <image name="search_green" width="15" height="16"/>
-        <image name="sort_down" width="8" height="6"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m

@@ -228,7 +228,7 @@
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, 200);
+    return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, 210);
 }
 /**
  设置没有数据时的显示

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -533,7 +533,6 @@
 - (MineFunctionView *)normalFunctionView {
     if (!_normalFunctionView) {
         _normalFunctionView = [MineFunctionView shareInstance];
-//        [_normalFunctionView configView];
         MJWeakSelf;
         [_normalFunctionView functionViewAction:^(MINEVIEWTYPE type) {
             [weakSelf operationAction:type];
@@ -545,7 +544,6 @@
 - (MineTeachToolView *)teachToolView {
     if (!_teachToolView) {
         _teachToolView = [MineTeachToolView shareInstance];
-//        [_teachToolView configView];
         MJWeakSelf;
         [_teachToolView functionViewAction:^(MINEVIEWTYPE type) {
             [weakSelf operationAction:type];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -216,7 +216,7 @@
     LiveCourseCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LiveCourseCell"];
     LiveCourseModel *model = self.dataArray[indexPath.row];
     COURSERSTATUS status = [self getCourseStatus:self.selectIndex];
-    [cell configCellWithSource:model groupStatus:status];
+    [cell configCellWithSource:model groupStatus:status hideStatusView:NO];
     return cell;
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageTopView.m → KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageTopView.m

@@ -183,13 +183,13 @@
 
 - (void)createTagLabelViewWithName:(NSString *)name frame:(CGRect)frame {
     UIView *bgView = [[UIView alloc] initWithFrame:frame];
-    bgView.backgroundColor = HexRGB(0xfff1de);
+    bgView.backgroundColor = HexRGB(0xEFFBF9);
     bgView.layer.cornerRadius = 4.0f;
     [self.subjectView addSubview:bgView];
     
     UILabel *tagLabel = [[UILabel alloc] init];
     tagLabel.text = name;
-    tagLabel.textColor = HexRGB(0xff8c00);
+    tagLabel.textColor = HexRGB(0x2DC7AA);
     tagLabel.font = [UIFont systemFontOfSize:11.0f];
     tagLabel.textAlignment = NSTextAlignmentCenter;
     [bgView addSubview:tagLabel];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageTopView.xib → KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageTopView.xib

@@ -18,7 +18,7 @@
                     <rect key="frame" x="14" y="39" width="386" height="240"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j04-k1-RIV">
-                            <rect key="frame" x="186" y="100" width="90" height="19"/>
+                            <rect key="frame" x="186" y="96" width="90" height="19"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7YI-eG-JcD" customClass="KSStarView">
                                     <rect key="frame" x="0.0" y="0.0" width="90" height="19"/>
@@ -36,25 +36,25 @@
                             </constraints>
                         </view>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="education_icon" translatesAutoresizingMaskIntoConstraints="NO" id="HE2-vS-rZC">
-                            <rect key="frame" x="58" y="57.5" width="39" height="16"/>
+                            <rect key="frame" x="62" y="57.5" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="16" id="89i-Zb-0oV"/>
                                 <constraint firstAttribute="width" constant="39" id="eqp-Dk-Zah"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qualification_icon" translatesAutoresizingMaskIntoConstraints="NO" id="V1i-h1-rXV">
-                            <rect key="frame" x="103" y="57.5" width="39" height="16"/>
+                            <rect key="frame" x="107" y="57.5" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="16" id="73J-NP-LJJ"/>
                                 <constraint firstAttribute="width" constant="39" id="MJP-a5-PaL"/>
                             </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="LhQ-B1-N8g">
-                            <rect key="frame" x="11" y="53" width="37" height="25"/>
+                            <rect key="frame" x="11" y="53" width="41" height="25"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="25" id="ttJ-dx-kxO"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
@@ -65,7 +65,7 @@
                                 <constraint firstAttribute="width" constant="60" id="5Lv-mb-fqw"/>
                                 <constraint firstAttribute="height" constant="28" id="dDW-No-JUn"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="编辑">
                                 <color key="titleColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
@@ -80,20 +80,20 @@
                             </connections>
                         </button>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_instrument_logo" translatesAutoresizingMaskIntoConstraints="NO" id="IsQ-zh-7a5">
-                            <rect key="frame" x="13" y="129" width="68" height="17"/>
+                            <rect key="frame" x="13" y="125" width="68" height="17"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="17" id="HJa-ca-Sql"/>
                                 <constraint firstAttribute="width" constant="68" id="JHn-lI-mz8"/>
                             </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="vZ2-QD-d8h">
-                            <rect key="frame" x="11" y="102" width="37" height="15"/>
+                            <rect key="frame" x="11" y="98" width="37" height="15"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nhJ-jg-o1N">
-                            <rect key="frame" x="48" y="97.5" width="76" height="24"/>
+                            <rect key="frame" x="48" y="93.5" width="76" height="24"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineStyle_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="lc6-oJ-H90">
                                     <rect key="frame" x="0.0" y="4" width="16" height="16"/>
@@ -137,13 +137,13 @@
                             </connections>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评分：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8kd-Ti-hHu">
-                            <rect key="frame" x="149" y="102" width="37" height="15"/>
+                            <rect key="frame" x="149" y="98" width="37" height="15"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fZT-24-HFt">
-                            <rect key="frame" x="91" y="129.5" width="285" height="16"/>
+                            <rect key="frame" x="91" y="125.5" width="285" height="16"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="16" id="vKC-05-GFT"/>
@@ -305,7 +305,7 @@
                         <constraint firstItem="HE2-vS-rZC" firstAttribute="centerY" secondItem="LhQ-B1-N8g" secondAttribute="centerY" id="Bmz-Yl-VO8"/>
                         <constraint firstItem="8kd-Ti-hHu" firstAttribute="centerY" secondItem="nhJ-jg-o1N" secondAttribute="centerY" id="JxI-Yd-tqh"/>
                         <constraint firstItem="j04-k1-RIV" firstAttribute="leading" secondItem="8kd-Ti-hHu" secondAttribute="trailing" id="MV0-Na-HhL"/>
-                        <constraint firstItem="vZ2-QD-d8h" firstAttribute="top" secondItem="LhQ-B1-N8g" secondAttribute="bottom" constant="24" id="MWA-aQ-3YI"/>
+                        <constraint firstItem="vZ2-QD-d8h" firstAttribute="top" secondItem="LhQ-B1-N8g" secondAttribute="bottom" constant="20" id="MWA-aQ-3YI"/>
                         <constraint firstAttribute="trailing" secondItem="sxy-XN-92K" secondAttribute="trailing" constant="11" id="OrZ-Lk-L6Y"/>
                         <constraint firstItem="LhQ-B1-N8g" firstAttribute="top" secondItem="w1f-9h-A4M" secondAttribute="top" constant="53" id="P4z-D4-aHE"/>
                         <constraint firstItem="sxy-XN-92K" firstAttribute="top" secondItem="w1f-9h-A4M" secondAttribute="top" constant="11" id="XOi-Hq-ObU"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface LiveCourseCell : UITableViewCell
 
-- (void)configCellWithSource:(LiveCourseModel *)model groupStatus:(COURSERSTATUS)status;
+- (void)configCellWithSource:(LiveCourseModel *)model groupStatus:(COURSERSTATUS)status hideStatusView:(BOOL)hideStatusView;
 
 @end
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.m

@@ -43,7 +43,7 @@
     _statusView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner;
 }
 
-- (void)configCellWithSource:(LiveCourseModel *)model groupStatus:(COURSERSTATUS)status {
+- (void)configCellWithSource:(LiveCourseModel *)model groupStatus:(COURSERSTATUS)status hideStatusView:(BOOL)hideStatusView {
     [self.coverImage sd_setImageWithURL:[NSURL URLWithString:[model.backgroundPic getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.courseName.text = [NSString returnNoNullStringWithString:model.courseGroupName];
         
@@ -80,6 +80,12 @@
             self.statusLabel.text = @"进行中";
             self.actionView.hidden = YES;
             self.orderUser.hidden = NO;
+//            if (hideStatusView) {
+//                self.statusView.hidden = YES;
+//            }
+//            else {
+                self.statusView.hidden = NO;
+//            }
         }
             break;
         case COURSERSTATUS_NOTSALE:

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineEmptyGroupCell.xib

@@ -28,8 +28,8 @@
                                     <constraint firstAttribute="height" constant="116" id="Tnc-lU-SgC"/>
                                 </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="UYe-Lq-Uwc">
-                                <rect key="frame" x="113" y="117" width="66.5" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="还没有内容，请「编辑」" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UYe-Lq-Uwc">
+                                <rect key="frame" x="73" y="117" width="146" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="ELU-si-7op"/>
                                 </constraints>
@@ -37,32 +37,6 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iD7-d8-i1b">
-                                <rect key="frame" x="107.5" y="145" width="77" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="r0I-Lz-Uf4"/>
-                                    <constraint firstAttribute="width" constant="77" id="soD-k6-f9A"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                <state key="normal" title="去创建">
-                                    <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                </state>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                        <color key="value" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                        <real key="value" value="1"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="15"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                                <connections>
-                                    <action selector="createGroup:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="h7P-ea-0GJ"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
@@ -70,8 +44,6 @@
                             <constraint firstItem="97a-Jr-ifI" firstAttribute="centerX" secondItem="1bZ-yk-gVU" secondAttribute="centerX" id="Mz0-ak-m9t"/>
                             <constraint firstItem="UYe-Lq-Uwc" firstAttribute="top" secondItem="97a-Jr-ifI" secondAttribute="bottom" constant="1" id="NVN-Nz-bvg"/>
                             <constraint firstItem="97a-Jr-ifI" firstAttribute="top" secondItem="1bZ-yk-gVU" secondAttribute="top" id="Rh9-AZ-aJ4"/>
-                            <constraint firstItem="iD7-d8-i1b" firstAttribute="centerX" secondItem="1bZ-yk-gVU" secondAttribute="centerX" id="S4R-IF-ex3"/>
-                            <constraint firstItem="iD7-d8-i1b" firstAttribute="top" secondItem="UYe-Lq-Uwc" secondAttribute="bottom" constant="10" id="TA4-IM-62e"/>
                             <constraint firstAttribute="height" constant="196" id="UlR-Mh-2nQ"/>
                         </constraints>
                     </view>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineEmptyIntroduceCell.xib

@@ -14,27 +14,24 @@
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="259" id="KGk-i7-Jjw" customClass="MineEmptyIntroduceCell">
             <rect key="frame" x="0.0" y="0.0" width="407" height="259"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
                 <rect key="frame" x="0.0" y="0.0" width="407" height="259"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L1e-7I-RtY">
+                    <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="L1e-7I-RtY">
                         <rect key="frame" x="14" y="0.0" width="379" height="247"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_introduce" translatesAutoresizingMaskIntoConstraints="NO" id="qj7-ba-7PB">
-                                <rect key="frame" x="12" y="16" width="24" height="24"/>
-                            </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hc9-f8-TsP">
-                                <rect key="frame" x="39" y="13" width="66" height="30"/>
+                                <rect key="frame" x="14" y="11" width="73.5" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="wfi-dV-rlU"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                <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="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vhk-Je-Vgt">
-                                <rect key="frame" x="0.0" y="51" width="379" height="196"/>
+                                <rect key="frame" x="0.0" y="49" width="379" height="196"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_noneIntroduce" translatesAutoresizingMaskIntoConstraints="NO" id="o7d-3q-pGP">
                                         <rect key="frame" x="109.5" y="0.0" width="160" height="116"/>
@@ -43,8 +40,8 @@
                                             <constraint firstAttribute="width" constant="160" id="4tQ-nv-mny"/>
                                         </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="kgL-9X-h43">
-                                        <rect key="frame" x="143" y="117" width="93" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="还没有内容，请「编辑」" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kgL-9X-h43">
+                                        <rect key="frame" x="116.5" y="117" width="146" height="18"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="18" id="lds-X2-xGx"/>
                                         </constraints>
@@ -52,42 +49,14 @@
                                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RT3-57-1CU">
-                                        <rect key="frame" x="151" y="145" width="77" height="30"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="77" id="J8r-aN-DGo"/>
-                                            <constraint firstAttribute="height" constant="30" id="Z9b-bj-Tqj"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                        <state key="normal" title="去填写">
-                                            <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                        </state>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                                <color key="value" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                                <real key="value" value="1"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="15"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="createIntroduce:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="le1-m3-US3"/>
-                                        </connections>
-                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstItem="RT3-57-1CU" firstAttribute="top" secondItem="kgL-9X-h43" secondAttribute="bottom" constant="10" id="DEe-yx-8Hv"/>
                                     <constraint firstItem="o7d-3q-pGP" firstAttribute="centerX" secondItem="vhk-Je-Vgt" secondAttribute="centerX" id="Eb0-a2-VRM"/>
                                     <constraint firstItem="kgL-9X-h43" firstAttribute="top" secondItem="o7d-3q-pGP" secondAttribute="bottom" constant="1" id="KEY-0A-v7X"/>
                                     <constraint firstItem="o7d-3q-pGP" firstAttribute="top" secondItem="vhk-Je-Vgt" secondAttribute="top" id="Pbk-gH-NMT"/>
                                     <constraint firstAttribute="height" constant="196" id="ZpP-MT-6ql"/>
                                     <constraint firstItem="kgL-9X-h43" firstAttribute="centerX" secondItem="o7d-3q-pGP" secondAttribute="centerX" id="l8U-F0-zsE"/>
-                                    <constraint firstItem="RT3-57-1CU" firstAttribute="centerX" secondItem="vhk-Je-Vgt" secondAttribute="centerX" id="tON-M1-frj"/>
                                 </constraints>
                             </view>
                         </subviews>
@@ -95,12 +64,10 @@
                         <constraints>
                             <constraint firstItem="vhk-Je-Vgt" firstAttribute="top" secondItem="Hc9-f8-TsP" secondAttribute="bottom" constant="8" id="Dkn-3Q-3Lg"/>
                             <constraint firstItem="vhk-Je-Vgt" firstAttribute="leading" secondItem="L1e-7I-RtY" secondAttribute="leading" id="FCc-1Z-gJE"/>
-                            <constraint firstItem="Hc9-f8-TsP" firstAttribute="centerY" secondItem="qj7-ba-7PB" secondAttribute="centerY" id="Qpr-1F-LkU"/>
+                            <constraint firstItem="Hc9-f8-TsP" firstAttribute="top" secondItem="L1e-7I-RtY" secondAttribute="top" constant="11" id="MOE-35-bmy"/>
                             <constraint firstAttribute="trailing" secondItem="vhk-Je-Vgt" secondAttribute="trailing" id="R5w-xc-env"/>
+                            <constraint firstItem="Hc9-f8-TsP" firstAttribute="leading" secondItem="L1e-7I-RtY" secondAttribute="leading" constant="14" id="fPp-R6-6ik"/>
                             <constraint firstAttribute="bottom" secondItem="vhk-Je-Vgt" secondAttribute="bottom" id="feF-LI-f4g"/>
-                            <constraint firstItem="qj7-ba-7PB" firstAttribute="top" secondItem="L1e-7I-RtY" secondAttribute="top" constant="16" id="h3P-PY-Cik"/>
-                            <constraint firstItem="qj7-ba-7PB" firstAttribute="leading" secondItem="L1e-7I-RtY" secondAttribute="leading" constant="12" id="xQk-jt-X6m"/>
-                            <constraint firstItem="Hc9-f8-TsP" firstAttribute="leading" secondItem="qj7-ba-7PB" secondAttribute="trailing" constant="3" id="ztM-Xr-Q2X"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -122,7 +89,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="mine_introduce" width="24" height="24"/>
         <image name="mine_noneIntroduce" width="160" height="116"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineEmptyVideoCell.xib

@@ -21,15 +21,12 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NPM-U1-Vpb">
                         <rect key="frame" x="14" y="0.0" width="360" height="241"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_video" translatesAutoresizingMaskIntoConstraints="NO" id="43U-Ne-lfa">
-                                <rect key="frame" x="12" y="14" width="24" height="16"/>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="老师风采" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bav-sT-Fl1">
-                                <rect key="frame" x="39" y="7" width="66" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="达人风采" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bav-sT-Fl1">
+                                <rect key="frame" x="14" y="7" width="73.5" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="4TK-79-L2E"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                <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="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -43,8 +40,8 @@
                                             <constraint firstAttribute="width" constant="160" id="bXk-eq-IA7"/>
                                         </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="uOg-DN-oGu">
-                                        <rect key="frame" x="133.5" y="117" width="93" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="还没有内容，请「编辑」" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uOg-DN-oGu">
+                                        <rect key="frame" x="107" y="117" width="146" height="18"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="18" id="wRu-lv-I3K"/>
                                         </constraints>
@@ -52,39 +49,11 @@
                                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pcy-IA-Pse">
-                                        <rect key="frame" x="141.5" y="145" width="77" height="30"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="77" id="eWW-kS-AZu"/>
-                                            <constraint firstAttribute="height" constant="30" id="reK-TB-oJi"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                        <state key="normal" title="去上传">
-                                            <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                        </state>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                                <color key="value" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                                <real key="value" value="1"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="15"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="createVideo:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="eiN-ZS-49n"/>
-                                        </connections>
-                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstItem="pcy-IA-Pse" firstAttribute="top" secondItem="uOg-DN-oGu" secondAttribute="bottom" constant="10" id="2Mw-Nw-WQT"/>
                                     <constraint firstAttribute="height" constant="196" id="T3m-bo-5Ez"/>
                                     <constraint firstItem="Cpl-4H-Dz0" firstAttribute="centerX" secondItem="qhn-d3-Yl0" secondAttribute="centerX" id="Tic-8M-llM"/>
-                                    <constraint firstItem="pcy-IA-Pse" firstAttribute="centerX" secondItem="qhn-d3-Yl0" secondAttribute="centerX" id="d3T-3S-sKU"/>
                                     <constraint firstItem="Cpl-4H-Dz0" firstAttribute="top" secondItem="qhn-d3-Yl0" secondAttribute="top" id="hNc-ko-hdh"/>
                                     <constraint firstItem="uOg-DN-oGu" firstAttribute="centerX" secondItem="Cpl-4H-Dz0" secondAttribute="centerX" id="nl0-Ge-Gz2"/>
                                     <constraint firstItem="uOg-DN-oGu" firstAttribute="top" secondItem="Cpl-4H-Dz0" secondAttribute="bottom" constant="1" id="tVd-SR-cCx"/>
@@ -93,13 +62,11 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="43U-Ne-lfa" firstAttribute="leading" secondItem="NPM-U1-Vpb" secondAttribute="leading" constant="12" id="9Eg-GS-m5R"/>
-                            <constraint firstItem="Bav-sT-Fl1" firstAttribute="centerY" secondItem="43U-Ne-lfa" secondAttribute="centerY" id="DiA-bY-kYn"/>
+                            <constraint firstItem="Bav-sT-Fl1" firstAttribute="top" secondItem="NPM-U1-Vpb" secondAttribute="top" constant="7" id="CLk-iQ-Otx"/>
                             <constraint firstItem="qhn-d3-Yl0" firstAttribute="leading" secondItem="NPM-U1-Vpb" secondAttribute="leading" id="FdP-2f-FLN"/>
+                            <constraint firstItem="Bav-sT-Fl1" firstAttribute="leading" secondItem="NPM-U1-Vpb" secondAttribute="leading" constant="14" id="RmR-Nw-AWt"/>
                             <constraint firstAttribute="trailing" secondItem="qhn-d3-Yl0" secondAttribute="trailing" id="hRg-Uc-hZZ"/>
                             <constraint firstAttribute="bottom" secondItem="qhn-d3-Yl0" secondAttribute="bottom" id="o3p-cM-J9C"/>
-                            <constraint firstItem="43U-Ne-lfa" firstAttribute="top" secondItem="NPM-U1-Vpb" secondAttribute="top" constant="14" id="wsz-NV-oXB"/>
-                            <constraint firstItem="Bav-sT-Fl1" firstAttribute="leading" secondItem="43U-Ne-lfa" secondAttribute="trailing" constant="3" id="xxc-2u-zgR"/>
                             <constraint firstItem="qhn-d3-Yl0" firstAttribute="top" secondItem="Bav-sT-Fl1" secondAttribute="bottom" constant="8" id="y31-Lg-gwT"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
@@ -123,7 +90,6 @@
     </objects>
     <resources>
         <image name="mine_noneVideo" width="160" height="116"/>
-        <image name="mine_video" width="24" height="24"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineIntroduceCell.xib

@@ -21,20 +21,17 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a3D-3i-sXd">
                         <rect key="frame" x="14" y="12" width="365" height="168"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_introduce" translatesAutoresizingMaskIntoConstraints="NO" id="QkR-ME-ZRI">
-                                <rect key="frame" x="12" y="16" width="24" height="24"/>
-                            </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DEP-oO-lGO">
-                                <rect key="frame" x="39" y="13" width="66" height="30"/>
+                                <rect key="frame" x="14" y="11" width="73.5" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="GuZ-yZ-DZq"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                <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="calibratedRGB"/>
                                 <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="sg2-Sp-iC5">
-                                <rect key="frame" x="12" y="61" width="341" height="87"/>
+                                <rect key="frame" x="12" y="59" width="341" height="89"/>
                                 <attributedString key="attributedText">
                                     <fragment content="毕业于中央音乐学员长笛专业，师从央音长笛系曾获2016年锦绣杯长笛大赛冠军自2018年起研究长笛启蒙、考级到专业考试教育总结出一套适合各个阶段需要的教学方式所教学员考级通过率100%，专业院校复试率92%">
                                         <attributes>
@@ -50,13 +47,11 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="sg2-Sp-iC5" secondAttribute="trailing" constant="12" id="1Y3-jk-FKI"/>
+                            <constraint firstItem="DEP-oO-lGO" firstAttribute="top" secondItem="a3D-3i-sXd" secondAttribute="top" constant="11" id="5tA-tD-DTV"/>
                             <constraint firstItem="sg2-Sp-iC5" firstAttribute="leading" secondItem="a3D-3i-sXd" secondAttribute="leading" constant="12" id="7hV-i9-0cR"/>
-                            <constraint firstItem="DEP-oO-lGO" firstAttribute="centerY" secondItem="QkR-ME-ZRI" secondAttribute="centerY" id="CmX-zB-pvi"/>
-                            <constraint firstItem="QkR-ME-ZRI" firstAttribute="top" secondItem="a3D-3i-sXd" secondAttribute="top" constant="16" id="Eol-2h-3j4"/>
                             <constraint firstAttribute="bottom" secondItem="sg2-Sp-iC5" secondAttribute="bottom" constant="20" id="RlY-eF-6PN"/>
                             <constraint firstItem="sg2-Sp-iC5" firstAttribute="top" secondItem="DEP-oO-lGO" secondAttribute="bottom" constant="18" id="Sac-GG-ls1"/>
-                            <constraint firstItem="QkR-ME-ZRI" firstAttribute="leading" secondItem="a3D-3i-sXd" secondAttribute="leading" constant="12" id="dHm-c2-Ms5"/>
-                            <constraint firstItem="DEP-oO-lGO" firstAttribute="leading" secondItem="QkR-ME-ZRI" secondAttribute="trailing" constant="3" id="f10-2F-RnQ"/>
+                            <constraint firstItem="DEP-oO-lGO" firstAttribute="leading" secondItem="a3D-3i-sXd" secondAttribute="leading" constant="14" id="WbW-RJ-hmu"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -81,7 +76,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="mine_introduce" width="24" height="24"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -6,7 +6,7 @@
 //
 
 #import "MinePageCourseView.h"
-#import "MinePageSubmitView.h"
+#import "MinePageSortView.h"
 #import "KSBaseWKWebViewController.h"
 #import "MusicMessageModel.h"
 #import "AccompanyCourseCell.h"
@@ -17,8 +17,7 @@
 #import "KSChatConversationViewController.h"
 #import "AccompanyDetailViewController.h"
 #import "KSFullDatePicker.h"
-#import "CourseTimeSegView.h"
-#import "MyMusicSearchView.h"
+#import "MusicSortView.h"
 #import "KSChoosePicker.h"
 #import "KSAccompanyWebViewController.h"
 
@@ -37,19 +36,18 @@
 
 @property (nonatomic, strong) AuthDisplayView *authView;
 
-@property (nonatomic, strong) MinePageSubmitView *uploadView;
+@property (nonatomic, strong) MinePageSortView *sortView;
 
 @property (nonatomic, assign) BOOL teacherAuthPass;  // 是否通过老师审核
 
 @property (nonatomic, assign) BOOL musicianPass; // 是否通过音乐人审核
 
-@property (nonatomic, strong) CourseTimeSegView *timeSortView;
 
 @property (nonatomic, strong) NSString *chooseMonth;
 
 @property (nonatomic, strong) NSDateFormatter *dateFormatter;
 
-@property (nonatomic, strong) MyMusicSearchView *searchView;
+@property (nonatomic, strong) MusicSortView *searchView;
 
 @property (nonatomic, strong) NSString *searchKey;
 
@@ -242,24 +240,13 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    CGFloat topHeight = 50.0f;
-    if (self.selectIndex == 1) {
-        topHeight = 50.0f + 34.0f;
-    }
-    else if (self.selectIndex == 4) {
-        topHeight = 50.0f + 50.0f;
-    }
+    CGFloat topHeight = [MinePageSortView getViewHeight];
+    
     self.tableView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
-    if (![self.subviews containsObject:self.uploadView]) {
-        [self addSubview:self.uploadView];
-        if (self.selectIndex == 1) {
-            [self addSubview:self.timeSortView];
-        }
-        if (self.selectIndex == 4) {
-            [self addSubview:self.searchView];
-            self.uploadView.frame = CGRectMake(0, 50.0f, KPortraitWidth, 50.0f);
-        }
-        if (self.selectIndex == 1 || self.selectIndex == 2) {
+    if (self.selectIndex != 4) {
+        if (![self.subviews containsObject:self.sortView]) {
+            [self addSubview:self.sortView];
+            
             if (self.teacherAuthPass == NO) {
                 [self showAuthView];
             }
@@ -267,7 +254,11 @@
                 [self hideAuthView];
             }
         }
-        else if (self.selectIndex == 4) {
+    }
+    else {
+        if (![self.subviews containsObject:self.searchView]) {
+            [self addSubview:self.searchView];
+            // 曲谱 sort
             if (self.teacherAuthPass == NO) {
                 [self showAuthView];
             }
@@ -291,7 +282,7 @@
         return 182.0f;
     }
     else {
-        return 110.0f;;
+        return 80.0f;;
     }
 }
 
@@ -308,13 +299,23 @@
     else if (self.selectIndex == 2) {
         LiveCourseCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LiveCourseCell"];
         LiveCourseModel *model = self.dataArray[indexPath.row];
-        [cell configCellWithSource:model groupStatus:COURSERSTATUS_ING];
+        [cell configCellWithSource:model groupStatus:COURSERSTATUS_ING hideStatusView:YES];
         return cell;
     }
     else {
         MusicMessageModel *model = self.dataArray[indexPath.row];
         MinePageMusicCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MinePageMusicCell"];
-        [cell configWithMessage:model];
+        ROWINDEX rowIndex = ROWINDEX_MIDDLE;
+        if (indexPath.row == 0 && self.dataArray.count == 1) {
+            rowIndex = ROWINDEX_TOP_BOTTOM;
+        }
+        else if (indexPath.row == 0) {
+            rowIndex = ROWINDEX_TOP;
+        }
+        else if (indexPath.row == self.dataArray.count - 1) {
+            rowIndex = ROWINDEX_BOTTOM;
+        }
+        [cell configWithMessage:model rowIndex:rowIndex];
         return cell;
     }
 }
@@ -458,33 +459,83 @@
     }
     return _dateFormatter;
 }
-- (CourseTimeSegView *)timeSortView {
-    if (!_timeSortView) {
-        _timeSortView = [CourseTimeSegView shareInstance];
-        [self.dateFormatter setDateFormat:@"yyyy年M月"];
+
+- (MinePageSortView *)sortView {
+    if (!_sortView) {
+        _sortView = [MinePageSortView shareInstance];
+        [self.dateFormatter  setDateFormat:@"yyyy-MM"];
         NSDate *currentDate = [NSDate date];
-        [_timeSortView.sortTitleLabel setText:[self.dateFormatter stringFromDate:currentDate]];
-        CGFloat topHeight = 60.0f;
-        _timeSortView.frame = CGRectMake(0, topHeight, kScreenWidth, 34);
+        SORTVIEWTYPE type = [self getSortViewType:self.selectIndex];
+        _sortView.viewType = type;
+        [_sortView.timeLabel setText:[self.dateFormatter stringFromDate:currentDate]];
+        CGFloat topHeight = [MinePageSortView getViewHeight];
+        _sortView.frame = CGRectMake(0, 0, KPortraitWidth, topHeight);
         MJWeakSelf;
-        [_timeSortView sortAction:^{
-            [weakSelf showPickerView];
+        [_sortView sortActionCallback:^(MINEPAGESORT type) {
+            [weakSelf sortViewAction:type];
         }];
     }
-    return _timeSortView;
+    return _sortView;
 }
 
+- (SORTVIEWTYPE)getSortViewType:(NSInteger)index {
+    if (index == 1) {
+        return SORTVIEWTYPE_ACCOMPANY;
+    }
+    else if (index == 2) {
+        return SORTVIEWTYPE_LIVE;
+    }
+    else {
+        return SORTVIEWTYPE_VIDEO;
+    }
+}
+
+- (void)sortViewAction:(MINEPAGESORT)type {
+    switch (type) {
+        case MINEPAGESORT_TIME:
+        {
+            [self showPickerView];
+        }
+            break;
+        case MINEPAGESORT_SETTING:
+        {
+            [self settingAction];
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)settingAction {
+    if (self.selectIndex == 1) { // 陪练课设置
+        KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+        webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/practiceSetting"];
+        [self.naviController pushViewController:webCtrl animated:YES];
+    }
+    else if (self.selectIndex == 2) { // 直播课
+        KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+        webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/liveCreate"];
+        [self.naviController pushViewController:webCtrl animated:YES];
+    }
+    else if (self.selectIndex == 4) {  // 曲谱上传
+        KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+        webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/music-upload"];
+        [self.naviController pushViewController:webCtrl animated:YES];
+    }
+}
+
+
 - (void)showPickerView {
     KSFullDatePicker *picker = [[KSFullDatePicker alloc] initWithTitle:@"" date:[NSDate date] pickMode:KSDATEPICKER_MODE_YEAR_MONTH selectDateBlock:^(NSString *date) {
 
         self.chooseMonth = date;
         NSString *displayTime = [self getTimeDisplay:date];
-        [self.timeSortView.sortTitleLabel setText:displayTime];
-        [self resetPickerStatus];
+        [self.sortView.timeLabel setText:displayTime];
         // 请求数据
         [self refreshAndRequestData];
     } cancleBlock:^{
-        [self resetPickerStatus];
+       
     }];
     [picker show];
 }
@@ -492,13 +543,10 @@
 - (NSString *)getTimeDisplay:(NSString *)chooseMonth {
     [self.dateFormatter setDateFormat:@"yyyy-MM"];
     NSDate *chooseDate = [self.dateFormatter dateFromString:chooseMonth];
-    [self.dateFormatter setDateFormat:@"yyyy年M月"];
     NSString *displayTime = [self.dateFormatter stringFromDate:chooseDate];
     return displayTime;
 }
-- (void)resetPickerStatus {
-    self.timeSortView.arrowUp = NO;
-}
+
 
 - (void)setTeaherStatus:(NSString *)teaherStatus {
     _teaherStatus = teaherStatus;
@@ -523,15 +571,6 @@
         }
     }
     
-    if (self.selectIndex == 1) {
-        self.uploadView.type = MINEPAGETYPE_ACCOMPANY;
-    }
-    else if (self.selectIndex == 2) {
-        self.uploadView.type = MINEPAGETYPE_LIVE;
-    }
-    else if (self.selectIndex == 4) {
-        self.uploadView.type = MINEPAGETYPE_MUSIC;
-    }
     if (self.selectIndex == 1 || self.selectIndex == 2 || self.selectIndex == 4) {
         if (self.teacherAuthPass == NO) {
             [self showAuthView];
@@ -607,49 +646,6 @@
 }
 
 
-
-- (MinePageSubmitView *)uploadView {
-    if (!_uploadView) {
-        _uploadView = [MinePageSubmitView shareInstance];
-        CGFloat topHeight = 60.0f;
-        _uploadView.frame = CGRectMake(0, 0, kScreenWidth, topHeight);
-        MJWeakSelf;
-        [_uploadView opreationCallback:^(MINEPAGETYPE type) {
-            [weakSelf uploadAciton:type];
-        }];
-    }
-    return _uploadView;
-}
-
-- (void)uploadAciton:(MINEPAGETYPE)type {
-    switch (type) {
-        case MINEPAGETYPE_ACCOMPANY:  // 陪练课设置
-        {
-            KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-            webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/practiceSetting"];
-            [self.naviController pushViewController:webCtrl animated:YES];
-
-        }
-            break;
-        case MINEPAGETYPE_LIVE:  // 直播课设置
-        {
-            KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-            webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/liveCreate"];
-            [self.naviController pushViewController:webCtrl animated:YES];
-        }
-            break;
-        case MINEPAGETYPE_MUSIC:  // 上传曲谱
-        {
-            KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-            webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/music-upload"];
-            [self.naviController pushViewController:webCtrl animated:YES];
-        }
-            break;
-        default:
-            break;
-    }
-}
-
 - (AuthDisplayView *)authView {
     if (!_authView) {
         _authView = [AuthDisplayView shareInstance];
@@ -728,24 +724,43 @@
     }
 }
 
-- (MyMusicSearchView *)searchView {
+
+- (MusicSortView *)searchView {
     if (!_searchView) {
-        _searchView = [MyMusicSearchView shareInstance];
-        CGFloat topHeight = 50.0f;
+        _searchView = [MusicSortView shareInstance];
+        CGFloat topHeight = [MusicSortView getViewHeight];
         _searchView.frame = CGRectMake(0, 0, kScreenWidth, topHeight);
         MJWeakSelf;
-        [_searchView musicSearchAction:^(NSString * _Nonnull searchKey, BOOL isChooseSubject) {
-            if (isChooseSubject) {
-                [weakSelf searchSubject];
-            }
-            else {
-                [weakSelf evaluateSource:searchKey];
-            }
+        [_searchView searchActionCallback:^(MUSICSORT type, NSString * _Nullable searchKey) {
+            [weakSelf musicSortAction:type searchKey:searchKey];
         }];
     }
     return _searchView;
 }
 
+- (void)musicSortAction:(MUSICSORT)type searchKey:(NSString *)searchKey {
+    switch (type) {
+        case MUSICSORT_UPLOAD:
+        {
+            [self settingAction];
+        }
+            break;
+        case MUSICSORT_SUBJECT:
+        {
+            [self searchSubject];
+        }
+            break;
+        case MUSICSORT_SEARCH:
+        {
+            [self evaluateSource:searchKey];
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+
 - (void)evaluateSource:(NSString *)searchKey {
     self.searchKey = searchKey;
     [self refreshAndRequestData];
@@ -761,24 +776,21 @@
         MJWeakSelf;
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部" sourceData:nameArray chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             if (chooseIndex == 0) {
-                weakSelf.searchView.sortTitleLabel.text = @"声部";
+                weakSelf.searchView.subjectLabel.text = @"声部";
                 weakSelf.subjectIds = nil;
             }
             else {
-                weakSelf.searchView.sortTitleLabel.text = returnValue;
+                weakSelf.searchView.subjectLabel.text = returnValue;
                 NSDictionary *parm = self.subjectList[chooseIndex-1];
                 weakSelf.subjectIds = [parm stringValueForKey:@"subjectId"];
             }
-            self.searchView.arrowUp = NO;
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            self.searchView.arrowUp = NO;
         }];
         [picker showPicker];
     }
     else {
         [self MBPShow:@"无声部信息"];
-        self.searchView.arrowUp = NO;
     }
 }
 /*

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMienBodyView.m

@@ -275,22 +275,15 @@
             maskLayer.path = path.CGPath;
             displayView.layer.mask = maskLayer;
         }
-        UIImageView *iconImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_fans"]];
-        [displayView addSubview:iconImage];
-        [iconImage mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(displayView.mas_left).offset(12);
-            make.top.mas_equalTo(displayView.mas_top).offset(17);
-            make.width.mas_equalTo(24);
-            make.height.mas_equalTo(24);
-        }];
+
         UILabel *tipsLable = [[UILabel alloc] init];
         tipsLable.text = @"粉丝群";
-        tipsLable.font = [UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium];
+        tipsLable.font = [UIFont systemFontOfSize:18.0f weight:UIFontWeightMedium];
         tipsLable.textColor = HexRGB(0x333333);
         [displayView addSubview:tipsLable];
         [tipsLable mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(iconImage.mas_right).offset(4);
-            make.centerY.mas_equalTo(iconImage.mas_centerY);
+            make.left.mas_equalTo(displayView.mas_left).offset(14);
+            make.top.mas_equalTo(displayView.mas_top).offset(11);
             make.height.mas_equalTo(30);
             make.width.mas_equalTo(100);
         }];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMusicCell.h

@@ -10,9 +10,16 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSInteger, ROWINDEX) {
+    ROWINDEX_TOP,
+    ROWINDEX_MIDDLE,
+    ROWINDEX_BOTTOM,
+    ROWINDEX_TOP_BOTTOM,
+};
+
 @interface MinePageMusicCell : UITableViewCell
 
-- (void)configWithMessage:(MusicMessageModel *)songMessage;
+- (void)configWithMessage:(MusicMessageModel *)songMessage rowIndex:(ROWINDEX)rowIndex;
 
 @end
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMusicCell.m

@@ -11,13 +11,17 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *songName;
 @property (weak, nonatomic) IBOutlet UILabel *songAuth;
-@property (weak, nonatomic) IBOutlet UIImageView *uploaderLogo;
-@property (weak, nonatomic) IBOutlet UILabel *uploaderName;
-@property (weak, nonatomic) IBOutlet UIImageView *typeImage;
 @property (weak, nonatomic) IBOutlet UIView *tagView;
 
 @property (weak, nonatomic) IBOutlet UIImageView *musicCover;
 
+@property (weak, nonatomic) IBOutlet UIView *typeView;
+@property (weak, nonatomic) IBOutlet UILabel *typeLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *bgView;
+
+@property (weak, nonatomic) IBOutlet UIView *lineView;
+
 @end
 
 @implementation MinePageMusicCell
@@ -27,44 +31,76 @@
     // Initialization code
     self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
-- (void)configWithMessage:(MusicMessageModel *)songMessage {
+
+- (void)configWithMessage:(MusicMessageModel *)songMessage rowIndex:(ROWINDEX)rowIndex {
+    
+    if (rowIndex == ROWINDEX_TOP) {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(10, 10)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = NO;
+    }
+    else if (rowIndex == ROWINDEX_BOTTOM) {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(10, 10)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = YES;
+    }
+    else if (rowIndex == ROWINDEX_TOP_BOTTOM) {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight|UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(10, 10)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = YES;
+    }
+    else {
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth - 28, 80) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(0, 0)];
+        CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+        maskLayer.frame = self.bgView.bounds;
+        maskLayer.path = maskPath.CGPath;
+        self.bgView.layer.mask = maskLayer;
+        self.lineView.hidden = NO;
+    }
+    
     self.songName.text = [NSString returnNoNullStringWithString:songMessage.musicSheetName];
-    self.songAuth.text = [NSString returnNoNullStringWithString:songMessage.composer];
+    NSString *authSting = [NSString stringWithFormat:@"作曲：%@",[NSString returnNoNullStringWithString:songMessage.composer]];
+    self.songAuth.text = authSting;
     
     NSArray *tagArray = nil;
     if (![NSString isEmptyString:songMessage.subjectNames]) {
         tagArray = [songMessage.subjectNames componentsSeparatedByString:@","];
     };
-    NSString *owner = @"";
-    if ([NSString isEmptyString:songMessage.addName]) {
-        owner = [NSString stringWithFormat:@"游客%.0f",songMessage.userId];
-    }
-    else {
-        owner = songMessage.addName;
-    }
-    CGFloat maxWidth = [self getTagViewMaxWidth:owner];
+   
+    CGFloat maxWidth = [self getTagViewMaxWidth:authSting];
     [self configTagViewWithTagArray:tagArray maxWidth:maxWidth];
-    NSString *typeImgName = @"";
+    
     if ([songMessage.chargeType isEqualToString:@"VIP"]) {
-        typeImgName = @"music_vip";
+        self.typeView.layer.borderColor = HexRGB(0xD38535).CGColor;
+        self.typeLabel.text = @"会员";
+        self.typeLabel.textColor = HexRGB(0xCD863E);
     }
     else if ([songMessage.chargeType isEqualToString:@"CHARGE"]) {
-        typeImgName = @"music_order";
+        self.typeView.layer.borderColor = HexRGB(0x50A2D8).CGColor;
+        self.typeLabel.text = @"点播";
+        self.typeLabel.textColor = HexRGB(0x3591CE);
     }
     else {
-        typeImgName = @"music_free";
+        self.typeView.layer.borderColor = HexRGB(0x01B84F).CGColor;
+        self.typeLabel.text = @"免费";
+        self.typeLabel.textColor = HexRGB(0x01B84F);
     }
-    [self.typeImage setImage:[UIImage imageNamed:typeImgName]];
-    
-    self.uploaderName.text = owner;
-    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.addUserAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
-    
+        
     [self.musicCover sd_setImageWithURL:[NSURL URLWithString:[songMessage.titleImg getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"music_logo"]];
 }
 
 - (CGFloat)getTagViewMaxWidth:(NSString *)teacherName {
-    CGFloat width = [self getStringWidthInLabel:teacherName font:[UIFont systemFontOfSize:12.0f]];
-    return kScreenWidth - 45  - 10 - 14 - width - 8;
+    CGFloat width = [self getStringWidthInLabel:teacherName font:[UIFont systemFontOfSize:10.0f]];
+    return KPortraitWidth - 70  - 28 - 12 - width - 7;
 }
 
 - (void)configTagViewWithTagArray:(NSArray *)tagArray maxWidth:(CGFloat)maxWidth {
@@ -73,14 +109,14 @@
     CGFloat xSpace = 0.0f;
     for (NSInteger i = 0; i < tagArray.count; i++) {
         NSString *tagString = tagArray[i];
-        CGFloat labelWidth = [self getStringWidthInLabel:tagString font:[UIFont systemFontOfSize:11.0f]];
-        CGFloat viewWidth = labelWidth + 8;
+        CGFloat labelWidth = [self getStringWidthInLabel:tagString font:[UIFont systemFontOfSize:10.0f]];
+        CGFloat viewWidth = labelWidth + 10;
         if (xSpace + viewWidth > width) {
             return;
         }
         CGRect frame = CGRectMake(xSpace, 0, viewWidth, 16.0f);
         [self createTagLabelViewWithName:tagString frame:frame];
-        xSpace += (viewWidth + 6);
+        xSpace += (viewWidth + 5);
     }
 }
 
@@ -91,19 +127,19 @@
 
 - (void)createTagLabelViewWithName:(NSString *)name frame:(CGRect)frame {
     UIView *bgView = [[UIView alloc] initWithFrame:frame];
-    bgView.backgroundColor = HexRGB(0xfff1de);
-    bgView.layer.cornerRadius = 4.0f;
+    bgView.backgroundColor = HexRGB(0xEFFBF9);
+    bgView.layer.cornerRadius = 8.0f;
     [self.tagView addSubview:bgView];
     
     UILabel *tagLabel = [[UILabel alloc] init];
     tagLabel.text = name;
-    tagLabel.textColor = HexRGB(0xff8c00);
-    tagLabel.font = [UIFont systemFontOfSize:11.0f];
+    tagLabel.textColor = HexRGB(0x2DC7AA);
+    tagLabel.font = [UIFont systemFontOfSize:10.0f];
     tagLabel.textAlignment = NSTextAlignmentCenter;
     [bgView addSubview:tagLabel];
     [tagLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(bgView.mas_left).offset(4);
-        make.right.mas_equalTo(bgView.mas_right).offset(-4);
+        make.left.mas_equalTo(bgView.mas_left).offset(5);
+        make.right.mas_equalTo(bgView.mas_right).offset(-5);
         make.top.bottom.mas_equalTo(bgView);
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMusicCell.xib

@@ -12,111 +12,113 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="127" id="KGk-i7-Jjw" customClass="MinePageMusicCell">
-            <rect key="frame" x="0.0" y="0.0" width="413" height="115"/>
+            <rect key="frame" x="0.0" y="0.0" width="413" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="413" height="115"/>
+                <rect key="frame" x="0.0" y="0.0" width="413" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eZd-kc-RgJ">
-                        <rect key="frame" x="14" y="0.0" width="385" height="103"/>
+                        <rect key="frame" x="14" y="0.0" width="385" height="80"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_logo" translatesAutoresizingMaskIntoConstraints="NO" id="xBX-sV-7hK">
-                                <rect key="frame" x="11" y="10" width="41" height="40"/>
+                                <rect key="frame" x="11" y="16" width="48" height="48"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="sWr-09-0yg"/>
-                                    <constraint firstAttribute="width" constant="41" id="wUC-OQ-6R6"/>
+                                    <constraint firstAttribute="height" constant="48" id="sWr-09-0yg"/>
+                                    <constraint firstAttribute="width" constant="48" id="wUC-OQ-6R6"/>
                                 </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="5wX-Qg-UK0">
-                                <rect key="frame" x="66" y="10" width="58" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="889-hG-0pZ"/>
-                                </constraints>
+                                <rect key="frame" x="105" y="16" width="57.5" height="17"/>
                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" 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="KNo-AM-8Um">
-                                <rect key="frame" x="66" y="30" width="144" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="作曲：尼古拉" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KNo-AM-8Um">
+                                <rect key="frame" x="70" y="47" width="74" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="er2-yj-87Q"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <color key="textColor" red="0.41568627450000001" green="0.41568627450000001" blue="0.41568627450000001" alpha="1" colorSpace="calibratedRGB"/>
+                                <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="ujv-HX-L1j">
-                                <rect key="frame" x="10" y="60" width="365" height="1"/>
-                                <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qO5-Vi-5dQ">
+                                <rect key="frame" x="151" y="47.5" width="191" height="16"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="NtP-23-T7h"/>
+                                    <constraint firstAttribute="height" constant="16" id="gHY-Dt-fsS"/>
                                 </constraints>
                             </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="vSK-7E-AyC">
-                                <rect key="frame" x="18" y="69" width="20" height="20"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vUL-Jj-5Vt">
+                                <rect key="frame" x="70" y="16" width="30" height="17"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点播" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PP9-cQ-QbK">
+                                        <rect key="frame" x="4.5" y="2.5" width="21" height="12"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                        <color key="textColor" red="0.20784313725490194" green="0.56862745098039214" blue="0.80784313725490198" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="20" id="F5A-99-KtI"/>
-                                    <constraint firstAttribute="height" constant="20" id="fU8-o8-TXi"/>
+                                    <constraint firstAttribute="width" constant="30" id="8yi-He-ckM"/>
+                                    <constraint firstItem="PP9-cQ-QbK" firstAttribute="centerX" secondItem="vUL-Jj-5Vt" secondAttribute="centerX" id="DFG-Qm-VbI"/>
+                                    <constraint firstAttribute="height" constant="17" id="k4z-6g-o13"/>
+                                    <constraint firstItem="PP9-cQ-QbK" firstAttribute="centerY" secondItem="vUL-Jj-5Vt" secondAttribute="centerY" id="y57-jR-AXO"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                        <real key="value" value="0.5"/>
+                                    </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="10"/>
+                                        <real key="value" value="4"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" red="0.20784313725490194" green="0.56862745098039214" blue="0.80784313725490198" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9CL-j5-vYW">
-                                <rect key="frame" x="45" y="71.5" width="37" height="15"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qO5-Vi-5dQ">
-                                <rect key="frame" x="90" y="71" width="285" height="16"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="16" id="gHY-Dt-fsS"/>
-                                </constraints>
                             </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imageView:USF-bE-ZKd:image" translatesAutoresizingMaskIntoConstraints="NO" id="USF-bE-ZKd">
-                                <rect key="frame" x="318" y="19" width="55" height="22"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_music_play" translatesAutoresizingMaskIntoConstraints="NO" id="qyC-cX-e8b">
+                                <rect key="frame" x="347" y="28" width="24" height="24"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="EPk-yc-6W4"/>
-                                    <constraint firstAttribute="width" constant="55" id="Pz0-aU-0vp"/>
+                                    <constraint firstAttribute="width" constant="24" id="44z-Nn-HMw"/>
+                                    <constraint firstAttribute="height" constant="24" id="JCu-SN-qbD"/>
                                 </constraints>
                             </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0z5-RP-2Hy">
+                                <rect key="frame" x="14" y="79.5" width="356" height="0.5"/>
+                                <color key="backgroundColor" red="0.90980392156862744" green="0.90980392156862744" blue="0.90980392156862744" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="0.5" id="YI5-ye-ONm"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="9CL-j5-vYW" firstAttribute="leading" secondItem="vSK-7E-AyC" secondAttribute="trailing" constant="7" id="2iU-lx-nvt"/>
-                            <constraint firstAttribute="trailing" secondItem="ujv-HX-L1j" secondAttribute="trailing" constant="10" id="7ns-id-aE9"/>
-                            <constraint firstItem="USF-bE-ZKd" firstAttribute="top" secondItem="eZd-kc-RgJ" secondAttribute="top" constant="19" id="8Ac-2I-5Bb"/>
-                            <constraint firstItem="ujv-HX-L1j" firstAttribute="top" secondItem="xBX-sV-7hK" secondAttribute="bottom" constant="10" id="E5b-1U-0iA"/>
-                            <constraint firstItem="5wX-Qg-UK0" firstAttribute="top" secondItem="xBX-sV-7hK" secondAttribute="top" id="GF0-N4-mRC"/>
-                            <constraint firstItem="qO5-Vi-5dQ" firstAttribute="leading" secondItem="9CL-j5-vYW" secondAttribute="trailing" constant="8" id="Mwk-yU-CCk"/>
-                            <constraint firstAttribute="trailing" secondItem="qO5-Vi-5dQ" secondAttribute="trailing" constant="10" id="QtY-Jd-8A9"/>
-                            <constraint firstItem="KNo-AM-8Um" firstAttribute="leading" secondItem="5wX-Qg-UK0" secondAttribute="leading" id="SAG-7K-K4z"/>
-                            <constraint firstItem="ujv-HX-L1j" firstAttribute="leading" secondItem="eZd-kc-RgJ" secondAttribute="leading" constant="10" id="W3P-sN-SBL"/>
-                            <constraint firstAttribute="trailing" secondItem="USF-bE-ZKd" secondAttribute="trailing" constant="12" id="Ybb-b6-3qY"/>
-                            <constraint firstItem="9CL-j5-vYW" firstAttribute="centerY" secondItem="vSK-7E-AyC" secondAttribute="centerY" id="Zkd-jQ-rlp"/>
-                            <constraint firstItem="xBX-sV-7hK" firstAttribute="top" secondItem="eZd-kc-RgJ" secondAttribute="top" constant="10" id="bfC-BN-GUB"/>
-                            <constraint firstItem="qO5-Vi-5dQ" firstAttribute="centerY" secondItem="9CL-j5-vYW" secondAttribute="centerY" id="bvZ-Nk-Gun"/>
+                            <constraint firstAttribute="bottom" secondItem="0z5-RP-2Hy" secondAttribute="bottom" id="EdW-Qt-gFP"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5wX-Qg-UK0" secondAttribute="trailing" constant="10" id="SV6-Ua-YmU"/>
+                            <constraint firstItem="5wX-Qg-UK0" firstAttribute="leading" secondItem="vUL-Jj-5Vt" secondAttribute="trailing" constant="5" id="Uw2-o9-W7K"/>
+                            <constraint firstItem="KNo-AM-8Um" firstAttribute="bottom" secondItem="xBX-sV-7hK" secondAttribute="bottom" id="WM8-AX-Frc"/>
+                            <constraint firstItem="qyC-cX-e8b" firstAttribute="centerY" secondItem="eZd-kc-RgJ" secondAttribute="centerY" id="XHu-lk-zgJ"/>
+                            <constraint firstItem="0z5-RP-2Hy" firstAttribute="leading" secondItem="eZd-kc-RgJ" secondAttribute="leading" constant="14" id="a6A-id-sIZ"/>
+                            <constraint firstItem="KNo-AM-8Um" firstAttribute="leading" secondItem="xBX-sV-7hK" secondAttribute="trailing" constant="11" id="c1W-4A-lpJ"/>
                             <constraint firstItem="xBX-sV-7hK" firstAttribute="leading" secondItem="eZd-kc-RgJ" secondAttribute="leading" constant="11" id="fgT-Ph-1JC"/>
-                            <constraint firstItem="5wX-Qg-UK0" firstAttribute="leading" secondItem="xBX-sV-7hK" secondAttribute="trailing" constant="14" id="mCv-ht-Blc"/>
-                            <constraint firstItem="vSK-7E-AyC" firstAttribute="top" secondItem="ujv-HX-L1j" secondAttribute="bottom" constant="8" id="sTo-Cw-Y1I"/>
-                            <constraint firstItem="KNo-AM-8Um" firstAttribute="top" secondItem="5wX-Qg-UK0" secondAttribute="bottom" id="xBS-GS-6Av"/>
-                            <constraint firstItem="vSK-7E-AyC" firstAttribute="leading" secondItem="eZd-kc-RgJ" secondAttribute="leading" constant="18" id="zid-dV-bbP"/>
+                            <constraint firstItem="vUL-Jj-5Vt" firstAttribute="top" secondItem="xBX-sV-7hK" secondAttribute="top" id="h4t-lc-arZ"/>
+                            <constraint firstItem="qyC-cX-e8b" firstAttribute="leading" secondItem="qO5-Vi-5dQ" secondAttribute="trailing" constant="5" id="ipq-5V-J1w"/>
+                            <constraint firstItem="qO5-Vi-5dQ" firstAttribute="leading" secondItem="KNo-AM-8Um" secondAttribute="trailing" constant="7" id="kc8-4f-j6V"/>
+                            <constraint firstItem="xBX-sV-7hK" firstAttribute="centerY" secondItem="eZd-kc-RgJ" secondAttribute="centerY" id="mAT-vQ-rp9"/>
+                            <constraint firstItem="qO5-Vi-5dQ" firstAttribute="centerY" secondItem="KNo-AM-8Um" secondAttribute="centerY" id="mUc-zy-UY8"/>
+                            <constraint firstAttribute="trailing" secondItem="0z5-RP-2Hy" secondAttribute="trailing" constant="15" id="ndn-cE-AmF"/>
+                            <constraint firstItem="5wX-Qg-UK0" firstAttribute="centerY" secondItem="vUL-Jj-5Vt" secondAttribute="centerY" id="pXr-De-Tat"/>
+                            <constraint firstItem="vUL-Jj-5Vt" firstAttribute="leading" secondItem="xBX-sV-7hK" secondAttribute="trailing" constant="11" id="vcR-WX-hCx"/>
+                            <constraint firstAttribute="trailing" secondItem="qyC-cX-e8b" secondAttribute="trailing" constant="14" id="z9c-xm-3Bm"/>
                         </constraints>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="10"/>
-                            </userDefinedRuntimeAttribute>
-                        </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
                 <constraints>
                     <constraint firstItem="eZd-kc-RgJ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="0GK-n4-j5V"/>
-                    <constraint firstAttribute="bottom" secondItem="eZd-kc-RgJ" secondAttribute="bottom" constant="12" id="QvQ-WA-Nao"/>
+                    <constraint firstAttribute="bottom" secondItem="eZd-kc-RgJ" secondAttribute="bottom" id="QvQ-WA-Nao"/>
                     <constraint firstItem="eZd-kc-RgJ" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="aep-pP-Em7"/>
                     <constraint firstAttribute="trailing" secondItem="eZd-kc-RgJ" secondAttribute="trailing" constant="14" id="eRM-cn-jh6"/>
                 </constraints>
@@ -124,1417 +126,21 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
+                <outlet property="bgView" destination="eZd-kc-RgJ" id="DDC-wq-TIl"/>
+                <outlet property="lineView" destination="0z5-RP-2Hy" id="8tz-Y9-pUv"/>
                 <outlet property="musicCover" destination="xBX-sV-7hK" id="Xce-kE-ajH"/>
                 <outlet property="songAuth" destination="KNo-AM-8Um" id="sE3-sB-pLo"/>
                 <outlet property="songName" destination="5wX-Qg-UK0" id="ibp-Xx-gL2"/>
                 <outlet property="tagView" destination="qO5-Vi-5dQ" id="Jau-UE-yYr"/>
-                <outlet property="typeImage" destination="USF-bE-ZKd" id="Gfe-OL-mVO"/>
-                <outlet property="uploaderLogo" destination="vSK-7E-AyC" id="IzE-RN-iKH"/>
-                <outlet property="uploaderName" destination="9CL-j5-vYW" id="giB-AV-2Aq"/>
+                <outlet property="typeLabel" destination="PP9-cQ-QbK" id="xTA-1a-Tsm"/>
+                <outlet property="typeView" destination="vUL-Jj-5Vt" id="Epk-ot-lUA"/>
             </connections>
-            <point key="canvasLocation" x="199.27536231884059" y="123.54910714285714"/>
+            <point key="canvasLocation" x="199.27536231884059" y="123.21428571428571"/>
         </tableViewCell>
     </objects>
     <resources>
-        <image name="imageView:USF-bE-ZKd:image" width="55" height="22">
-            <mutableData key="keyedArchiveRepresentation">
-YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
-S2V5ZWRBcmNoaXZlctEICVRyb290gAGvEBcLDBkaIRQmKywzNjs+P0RHSEtVXV5iZVUkbnVsbNYNDg8Q
-ERITFBUWFxhWTlNTaXplXk5TUmVzaXppbmdNb2RlViRjbGFzc1xOU0ltYWdlRmxhZ3NWTlNSZXBzV05T
-Q29sb3KAAhAAgBYSIMAAAIADgBFYezU1LCAyMn3SGw8cIFpOUy5vYmplY3Rzox0eH4AEgAqADYAQ0hsP
-IiWiIySABYAGgAnTDycoKSoUXxAUTlNUSUZGUmVwcmVzZW50YXRpb25fEBlOU0ludGVybmFsTGF5b3V0
-RGlyZWN0aW9ugAiAB08RIA5NTQAqAAAS8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhHx4haWNf
-ab6zrL7t4dft/vDm/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5//+8Ob+7+LZ78G3r8FuaWRuIyIgIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMhICOVjomV6N7V6P/37f//9Or///Lo///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///y6P//9Or///ft/+rg1+qblY6bKSYlKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AFtWU1vm29Pm//vx///06v//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///9Or///vw
-/+vg1utkXlpkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG5oZG778uj7//bs///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///9ev//fTq/XlybXkAAAAAAAAA
-AAAAAAAAAAAAAAAAAFNPS1P78Ob7//Tq///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///06///8ej///Hn///x5///8ef///Hn///x5///8ef///Hn///y6P//9Ov///Tr///06///9Ov///Tr
-///06v//9Ov///Ts///z6f//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///06v/98+r9XllVXgAAAAAAAAAAAAAAABsZGRvg1Mzg//fs
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///27f//rIj//8iv///37///8+r///Pq
-///x5///8ef///Hn///y6P//6d3//9C6///Tvv//qIT//6+O///Nt///k2f//8qz///RvP//49T///Lo
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///br/+bb0uYjIR8jAAAAAAAAAACEfXiE//vw///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///48P//uJr//00M//96Rf//ilv//4la//+IWP//5tj///Lp///x5///8+r//9zL
-//+Ybf//l23//20z//90Pf//kmb//1gX//+RZf//ekr//511///27f//8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///06v//9Ov///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///+/D/kImD
-kAAAAAAREBAR2s7G2v/27P//8ef///Hn///x5///8ef///Hn///x5///8ef///Ho///17P//tpf//3pG
-///Svv//3Mr//9fE//+HWP//jV////fv///27f//8ef///Ho///t4f//nHP//594//90Pf//e0f//5ty
-//9eH///mnH//4FO//+hev//9+7///Hn///x5///8ef///Hn///x5///8ef///Hn///z6f//08X//9LD
-///27f//8ef///Hn///x5///8ef///Hn///x5///8ef///Xr/+PWzeMYFhUYQT47Qf3y6P3/8uj///Hn
-///x5///8ef///Hn///x5///8ef///Hn///y6P//nnb//1YV//+PY///qob//6qH//+QY///Whv//553
-//+kgf//y7P///Tr///07P//0Lr//2Up//+wjv//d0H//4dX//+ohP//YST//6WA//+tiv//vaH//+rd
-///y6P//8ef///Hn///x5///8ef///Hn///x5///8+n//+LW//+Ve///xbP///bt///x5///8ef///Hn
-///x5///8ef///Hn///x5///9uz/T0tIT394c3//9+z///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8Ob//863//+PYf//hFP//7KS//+WbP//ZCj//7GQ//+ykv//gVD//5Ro///48f//8+r//+DQ
-//+ujP//hVT//2Ik//+qiP//poH//18h//+lgf//o33//2gt///XxP//9Ov///Hn///x5///8ef///Hn
-///x5///8ef///Hn///06v//7OH//5yE//+3pP//9Oz///Hn///x5///8ef///Hn///x5///8ef///bs
-/5SMhpSkm5Wk//Tq///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///68v//mXH//7ST
-/////P//xq3//4RT///58////ff//7WU//+Wa///+PH///Pp///Ot///kGf//3Y////Bpv//7+T//+PU
-//+NXv//28r//5dt//+ZcP//7eL///Lo///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Pp
-///06v//o43//62Y///16///8ef///Hn///x5///8ef///Hn///06v+5rqe5pJuUpP/06v//8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///9u3//593//9rNP//iFj//2sx//9eH///gE7//4VU
-//9rNf//nXX///jx///z6v//2sj//49j//9nK///hlb//4FP//+ATv//gU7//4BO//9nK///1cD///Xs
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///06///6+D//5qC//+9qv//9Or///Hn
-///x5///8ef///Hn///x5///9Or/ua6nuX94c3//9+z///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Lo///l1v//1sT//8u0//9oLP//pH7//3I6///PuP//1MH//+XX///27f//8ef///r0
-//+wjv//kmf///bt///Rvf//m3L//+3h///t4f//gE3//8qx///17P//8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///17P//4tX//5N5///JuP//9+3///Hn///x5///8ef///Hn///x5///8ef///bs
-/5SMhpRBPjtB/fLo/f/y6P//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///y6P//+PD//+/k
-//+JWv//m3L//9jE//9/TP//8uj///ny///ayP//r43///Lo///48P//roz//5lv////////pYD//5Fl
-///z6v//+fH//4hY///Ls///9ez///Hn///x5///8ef///Hn///x5///8ef///Hn///z6v//1cf//5F2
-///Vx///9u3///Hn///x5///8ef///Hn///x5///8ef///Hn///27P9PS0hPERAQEdrOxtr/9uz///Hn
-///x5///8ef///Hn///x5///8ef///Hn///y6P//7eH//8Gm//90Pf//l23///Pp///Ww///cjr//9zK
-///p2///rYv//4ZW///37v//8+n//9rI///LtP//vaH//2wy//+3mP//iVn//5ds//+kf///387///Pp
-///x5///8ef///Hn///x5///8ef///Hn///x5///8+r//8q5///e0P//9ez///Hn///x5///8ef///Hn
-///x5///8ef///Hn///16//j1s3jGBYVGAAAAACEfXiE//vw///x5///8ef///Hn///x5///8ef///Hn
-///x5///8uj//5pw//99Sv//xq3///Xs///z6v//69///4NR//9wOv//d0L//241///Bpv//+PD//7SU
-//+CVf//f03//4xe///Puf//8+r//9/O//+5m///i1z//4FQ///i0///8+n///Hn///x5///8ef///Hn
-///x5///8ef///Hn///16///8+n///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///+/D/kImD
-kAAAAAAAAAAAGxkZG+DUzOD/9+z///Hn///x5///8ef///Hn///x5///8ef///Hn///m1///8eb///bt
-///x5///8ef///Lo///y6P//7OD//+vf///u4///8+r///Lo///i0///28n//+zg///17P//9ez///Hn
-///z6f//9+////Pq///g0P//7uP///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///9uv/5tvS5iMhHyMAAAAAAAAAAAAAAABTT0tT+/Dm
-+//06v//8ef///Hn///x5///8ef///Hn///x5///8uj///Ho///x5///8ef///Hn///x5///8ef///Lo
-///y6P//8ej///Hn///x5///8un///Pq///y6P//8ef///Hn///x5///8ef///Hn///x5///8+n///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///9Or//fPq/V5ZVV4AAAAAAAAAAAAAAAAAAAAAAAAAAG5oZG778uj7//bs///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///9ev//fTq/XlybXkAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAW1ZTW+bb0+b/+/H///Tq///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///06v//+/D/6+DW62ReWmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAjISAjlY6Jleje1ej/9+3///Tq///y6P//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8uj///Tq///37f/q4Nfqm5WO
-mykmJSkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhHx4haWNg
-ab60rL7t4dft/vDm/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn
-///x5///8ef///Hn///x5//+8Ob+7+LZ78G3sMFuaWRuIyIgIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAEAEAAAMAAAABADcAAAEBAAMAAAABABYAAAECAAMAAAAEAAATtgEDAAMAAAABAAEAAAEGAAMA
-AAABAAIAAAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMA
-AAABABYAAAEXAAQAAAABAAAS6AEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMA
-AAAEAAATvodzAAcAAAxIAAATxgAAAAAACAAIAAgACAABAAEAAQABAAAMSExpbm8CEAAAbW50clJHQiBY
-WVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1I
-UCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARY3BydAAAAVAA
-AAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAAAhgAAAAUZ1hZWgAAAiwA
-AAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAAA0wAAACGdmlldwAAA9QA
-AAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAABDwAAAgMZ1RSQwAABDwA
-AAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3bGV0dC1QYWNrYXJkIENv
-bXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAASc1JHQiBJRUM2MTk2
-Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAA
-AAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAb6IAADj1AAADkFhZWiAA
-AAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAAABZJRUMgaHR0cDovL3d3
-dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0
-IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0IFJH
-QiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALFJlZmVy
-ZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAACxSZWZlcmVuY2Ug
-Vmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2
-aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABMCVYAUAAAAFcf521lYXMA
-AAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1cnYAAAAAAAAEAAAAAAUA
-CgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3AHwAgQCGAIsAkACVAJoA
-nwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQETARkBHwElASsBMgE4AT4B
-RQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHpAfIB+gIDAgwCFAIdAiYC
-LwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAMLAxYDIQMtAzgDQwNPA1oD
-ZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+BIwEmgSoBLYExATTBOEE
-8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZIBlkGagZ7BowGnQavBsAG
-0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghuCIIIlgiqCL4I0gjnCPsJ
-EAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3ArzCwsLIgs5C1ELaQuAC5gL
-sAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3eDfgOEw4uDkkOZA5/DpsO
-tg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExExEU8RbRGMEaoRyRHoEgcS
-JhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTwFRIVNBVWFXgVmxW9FeAW
-AxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkgGUUZaxmRGbcZ3RoEGioa
-URp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3DHeweFh5AHmoelB6+Hukf
-Ex8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLdIwojOCNmI5QjwiPwJB8k
-TSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhxKKIo1CkGKTgpaymdKdAq
-Aio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6CLrcu7i8kL1ovkS/HL/4w
-NTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUTNU01hzXCNf02NzZyNq42
-6TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76DwnPGU8pDzjPSI9YT2hPeA+
-ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPARANER0SKRM5FEkVVRZpF
-3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkviTCpMcky6TQJNSk2TTdxO
-JU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSPVNtVKFV1VcJWD1ZcVqlW
-91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3JXhpebF69Xw9fYV+zYAVg
-V2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeTZ+loP2iWaOxpQ2maafFq
-SGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHwcktypnMBc11zuHQUdHB0
-zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzhfUF9oX4BfmJ+wn8jf4R/
-5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhpiM6JM4mZif6KZIrKizCL
-lov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSKlPSVX5XJljSWn5cKl3WX
-4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFHobaiJqKWowajdqPmpFak
-x6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6hrxavi7AAsHWw6rFgsday
-S7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8IbybvRW9j74KvoS+/796v/XA
-cMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbP
-N8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp22vvbgNwF3IrdEN2W3hze
-ot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb6uXrcOv77IbtEe2c7iju
-tO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn+3f8B/yY/Sn9uv5L/tz/
-bf//0i0uLzBaJGNsYXNzbmFtZVgkY2xhc3Nlc18QEE5TQml0bWFwSW1hZ2VSZXCjLzEyWk5TSW1hZ2VS
-ZXBYTlNPYmplY3TSLS40NVdOU0FycmF5ojQy0hsPNyWiIzmABYALgAnTDycoKT0UgAiADE8RWO5NTQAq
-AABLqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAqKCYqbGZibKCXkaDHvLTH5dnQ5fPm3PP+8Ob+//Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7w5v705970
-59vS58vAuMukm5Wkc21oczIvLTICAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAB0cGh2AeXSA3NDI3P/x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn/+XYz+WKg32KJiQjJgAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0cGx2ck42c+evi+f/x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5//87+X8qaCZqSgmJSgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDAwN2cGx29Obd9P/x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/+ezi+YeAe4cICAcIAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGRga
-wLavwP/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn/9DFvdAnJSMnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAALiwqLubZ0Ob/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn//Dj2vBAPTpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc0Mjfv4tnv//Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//fq4PdLR0RL
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJiQo69/V6//x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn//Xo3vU7ODU7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Dg0MDtvPxtv/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn/+rd1OoaGRgaAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAACnnpen//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn/8C2r8ACAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS0dFS//x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///h0f//hlX//7aX///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///hFL/
-/6J8///x5///8ef///Hn//+Ybv//jmD///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn/2diXmcAAAAAAAAAAAAAAAAAAAAAAAAAAAUFBQXd0cjd
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///7+X//3Q9//9HAP//uJn///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///RvP//q4j/
-/6uI//+riP//q4j//6uI//9IAv//ZSj//6uI//+riP//q4j//1sb//9SD///q4j//6uI//+riP//q4j/
-/6uI///k1f//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/7eDX7REQDxEAAAAA
-AAAAAAAAAAAAAAAAYl1aYv/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//+acf//RwD/
-/1QS//+Ybv//mG7//5hu//+Ybv//mG7//5hu//+Ybv//nXT///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef//6R+//9HAP//RwD//0cA//9HAP//RwD//0cA//9HAP//RwD//0cA//9HAP//RwD/
-/0cA//9HAP//RwD//0cA//9HAP//RwD//9G7///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef/fnhzfgAAAAAAAAAAAAAAAAAAAADYzcTY//Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///qYX//0cA//9HAP//RwD//0cA//9HAP//RwD//0cA//9HAP//RwD//0cA//9SD///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8Ob///Dl///w5f//8OX///Dl///w5f//SgT/
-/3lE///w5f//8OX///Dl//9pLv//Whr///Dl///w5f//8OX//6V///9HAP//0bv///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5//s4NbsCAgHCAAAAAAAAAAAOjc0Ov/x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef//6uH//9IAf//YiX//9nH///m2P//5tj//+bY///m2P//5tj/
-/+PU//9yOv//RwD//7aW///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///rYr/
-/6N9//+jff//o33//6N9//9IAv//YiX//6N9//+jff//o33//1oZ//9RDv//o33//6N9//+jff//ekX/
-/0cA///Ru///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef//+ne///t4v//8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5/9WUU5W
-AAAAAAAAAACTi4WT//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+/l//+UZ///RwD//2cs///j1P//8ef/
-//Hn///x5///8ef///Hn///u4///g1L//0cA//+jff//8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef//+ve//9JA///TQj//1YU//9WFP//VhT//0cA//9LBv//VhT//1YU//9WFP//SgT/
-/0gC//9WFP//VhT//1YU//9WFP//VhT//9O////x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///o4z//1k1///i1v//8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn/6+ln68AAAAAAAAAANjMxNj/8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///byf//cDj/
-/0cA//9pLv//4NH//+vf///r3///69///+vf///r3///59n//3xH//9HAP//nnb//+vf///r3///69//
-/+vf///s4P//8ef///Hn///x5///8ef///Hn///x5///y7T//0cA//+mgf//8ef///Hn///j0///RwD/
-/4hY///x5///8ef///Hn//9qL///Whr///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///ln3//0ok///Xyf//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/8OPa8AMDAwMYFxYY/vHn/v/x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///5db//1MQ//9HAP//aC3//0cA//9HAP//RwD//0cA//9HAP//RwD//0cA//9HAP//RwD/
-/0cA//9HAP//RwD//0cA//9HAP//RwD//2Ah///x5///8ef///Hn///x5///8ef///Hn//+phf//RwD/
-/3xI//+PYv//j2L//4BN//9HAP//aS///49i//+PYv//j2L//1UT//9PC///j2L//49i//+PYv//j2L/
-/49i//+PYv//0Lr///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///rZf//0Ib///It///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-MzEvM0M/PUP/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///spH//72g//++of//RwD//3Q8//+PYv//j2L/
-/49i//+PYv//czz//0cA//92P///j2L//49i//+PYv//j2L//49i//9VE///YCH///Hn///x5///8ef/
-//Hn///x5///8ef//6WB//9yO///cjv//3I7//9wN///RwD//0oE//9yO///cjv//3I7//9yO///UAz/
-/0wG//9yO///cjv//3I7//9yO///ZSn//0cA//+9oP//8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///wa7/
-/0EZ//+2ov//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5/9fWlZfaWRfaf/x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-/76h//9HAP//sI////Hn///x5///8ef///Hn//+lgP//RwD//76i///x5///8ef///Hn///x5///8ef/
-/2gt//9gIf//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///6dz//4JQ//9HAP//oXr/
-//Hn///x5///8ef///Hn//9qL///Whr///Hn///x5///8ef///Hn//+ui///RwD//8+5///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///0MH//0Yf//+hif//8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn/4V+eYV9d3J9//Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///vqH//0cA//+wj///8ef///Hn///x5///8ef//5Zr//9HAP//y7P/
-//Hn///x5///8ef///Hn///x5///aC3//2Ah///x5///8ef///Hn///x5///8ef///Hn///x5///28n/
-/593//9WFP//RwD//4xd///v5f//8ef///Hn///x5///8ef//2ov//9aGv//8ef//+re//9/TP//e0f/
-/1AN//9eH///7uL///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///3dD//1Es//+Jbv//8Ob/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-mZGLmYqDfYr/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//++of//RwD//7CP///x5///8ef/
-//Hn///x5///ekX//0cA///k1f//8ef///Hn///x5///8ef///Hn//9oLf//YCH///Hn///x5///8ef/
-//Hn///x5///zrf//2Ik//9HAP//RwD//3A3///Apf//8ef///Hn///x5///8ef///Hn///x5///sI7/
-/6mE///x5///8ef//6B5//+Ybv//rYr//+bZ///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///59v//1s5//+EaP//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5/+mnZemioN9iv/x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-/76h//9HAP//h1b//66M//+ujP//roz//66M//9VE///TQj//66M//+ujP//roz//66M//+ujP//roz/
-/1sb//9gIf//8ef///Hn///x5///8ef///Hn///v5P//iVr//6B5//9mKf//XB3//1wd//9cHf//XB3/
-/1wd//9cHf//XB3//1wd//9cHf//XB3//1wd//9cHf//XB3//1wd//+2l///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///CsP//QRn//7ek///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn/6adl6Z9dnF9//Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///vqH//0cA//9HAP//RwD//0cA//9HAP//RwD//0cA//9HAP//RwD/
-/0cA//9HAP//RwD//0cA//9HAP//RwD//2Ah///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-/200//9KBf//gE3//4BN//+ATf//gE3//4BN//+ATf//gE3//4BN//+ATf//gE3//4BN//9uNf//RwD/
-/66L///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///sJv//0Ia///Htv//8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-mZGLmWlkX2n/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///l1v//yK///8iv///Ir///yK//
-/8iv//95Q///RwD//6iE//+acv//RwD//5ds///Ir///yK///8iv///Ir///zrf///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///bTT//1IP///x5///8ef///Hn///x5///49T//6aC///Ot///8ef/
-//Hn///x5///8ef//7yf//9HAP//rov///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-/5uD//9IIv//1cb///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5/+FfnmFQz89Q//x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///2cf//08L//9hI///7+T//7WW//9HAP//sI////Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//9tNP//Ug////Hn///x5///8ef/
-//Hn///Cp///RwD//6F6///x5///8ef///Hn///x5///vJ///0cA//+ui///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Dl//+FaP//VTH//+DT///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn/19aVl8YFxYY/vHn/v/x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+ve//9mK///RwH//8et///x5///tZb/
-/0cA//+wj///8ef///Hn///x5///8ef///Hn///cy///3sz///Hn///x5///8ef///Hn///x5///8ef/
-/200//9SD///8ef///Hn///x5///8ef//511//9HAP//wKT///Hn///x5///8ef///Hn//+8n///RwD/
-/66L///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///r4P//b0///2ZF///p3f//8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-MzEvMwAAAADYzMTY//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///i0///bjX/
-/0cA//+SZv//8ef///Hn//+1lv//RwD//7CP///x5///8ef///Hn///x5///8ef//6uI//9HAP//yLD/
-//Hn///x5///8ef///Hn///x5///bTT//1IP///x5///8ef///Hn///v5P//YiT//0wH///p3f//8ef/
-//Hn///x5///8ef//7yf//9HAP//rov///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///5Nj//106//96XP//7uT/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn//Dj2vADAwMDAAAAAJOLhZP/8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///xq3//1wc//9HAP//k2f///Dm///x5///8ef//7WW//9HAP//sI////Hn///x5///8ef/
-//Hn///x5///nXT//0cA///UwP//8ef///Hn///x5///8ef///Hn//+acv//iVn///Hn///x5///8ef/
-/6aB//9HAP//h1b//+HS//+RZf//wKP//+rd///x5///zrj//4FP///Fqv//8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn//9ePP//kXb///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/r6WfrwAAAAAAAAAAOjc0Ov/x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///3Mr//4BO//9HAP//Tgn//6iD///x5///8ef///Hn///x5///uJr/
-/0cA//+edv//8ef///Hn///x5///8ef///Hn//97R///SAL//+vf///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef//+LS//+TZ///SAL//1UT///dzP//qYX//04K//9HAP//TAb//3Q+//+lgP//4ND/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef//+ba///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5/9WUU5W
-AAAAAAAAAAAAAAAA2M3E2P/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5v//x67//35L//9JA///RwD//3dB///byf//8ef/
-//Hn///x5///8ef///Hn///Ru///RwD//00I//96Rf//gE3//4BN//+ATf//dD3//0cA//9qL///8ef/
-//Hn///x5///5NX//8+4///Bpv//rIr//5Bk//9sM///SAL//0cA//9pLv//1MD///Hn///x5///7OD/
-/8Kn//+QY///XR7//0cA//9JA///eUP//7ia///s4P//8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef/7ODW7AgIBwgAAAAAAAAAAAAAAABiXVpi//Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+vf//9nLP//SAH/
-/3lF///Hrf//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//+SZv//Twv//0cA//9HAP//RwD/
-/0cA//9IAf//YCH//8eu///x5///8ef///Hn//+9oP//RwD//0cA//9HAP//SQP//2Up//+MXf//xqz/
-/+/l///x5///8ef///Hn///x5///8ef///Hn///w5v//xav//4FP//9LBv//RwD//7qc///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5/9+eHN+AAAAAAAAAAAAAAAAAAAAAAUFBQXd0cjd
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef//97M///Wwv//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///w5v//7uP//+7j///u4///7uP//+/k///x5///8ef///Hn///x5///8ef///Dl//+ykv//wqb/
-/9S////r3v//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-/+PU//+2l///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/7eDX7REQDxEAAAAA
-AAAAAAAAAAAAAAAAAAAAAEtHRUv/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5/9nYl5nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKeel6f/8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef/wLavwAICAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Dg0MDtrPxtr/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn/+rd1OoaGRgaAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCYkKOvf1ev/8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//16N71
-Ozg1OwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANzQyN+/i2e//8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef/9+rg90tHREsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAALiwqLubZ0Ob/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn//Dj2vBAPTpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhkYGsG2r8H/8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//Qxb3QJyUjJwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AwMDA3ZwbHb05t30//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//57OL5
-h4B7hwgICAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0cGx2ck42c+evi+f/x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5//87+X8qaCZqSgmJSgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdHBod
-gHl0gNzQyNz/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5//l2M/lioN9iiYkIyYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACooJypsZmJsoJeRoMe9tcfl2dDl8+bc8/7w5v7/8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/
-//Hn///x5///8ef//vDm/vTn3vTn29Lny8C4y6SblaRzbWlzMi8tMgICAgIAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgEAAAMAAAABAG4AAAEB
-AAMAAAABACwAAAECAAMAAAAEAABMlgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAEKAAMAAAABAAEAAAER
-AAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABACwAAAEXAAQAAAABAABLoAEa
-AAUAAAABAABMhgEbAAUAAAABAABMjgEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFT
-AAMAAAAEAABMnodzAAcAAAxIAABMpgAAAAAAAACQAAAAAQAAAJAAAAABAAgACAAIAAgAAQABAAEAAQAA
-DEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAA
-AAAAAAAAAAD21gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MAAAGEAAAAbHd0cHQAAAHwAAAAFGJrcHQAAAIEAAAAFHJY
-WVoAAAIYAAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAAcGRtZGQAAALEAAAAiHZ1
-ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJU
-UkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29weXJpZ2h0IChjKSAxOTk4
-IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAA
-AAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAAAAAAAAAAAAAAWFlaIAAA
-AAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAkoAAAD4QAALbPZGVzYwAA
-AAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNo
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALklF
-QyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAALklFQyA2
-MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABkZXNjAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAA
-AAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQTCwADXJ4AAAABWFlaIAAA
-AAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENS
-VCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABt
-AHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEH
-AQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZ
-AeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1
-AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRj
-BHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYn
-BjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghG
-CFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrF
-CtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2p
-DcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1
-ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixSt
-FM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjV
-GPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1w
-HZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKC
-Iq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgN
-KD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4W
-Lkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSe
-NNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuq
-O+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6
-Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtT
-S5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2
-VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0n
-XXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmbo
-Zz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6
-cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwh
-fIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4ef
-iASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2
-lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBp
-oNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24
-ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7Lrun
-vCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4
-yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls
-2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG
-6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH
-+lf65/t3/Af8mP0p/br+S/7c/23//9IbD0AloiNCgAWADoAJ0w8nKClGFIAIgA9PEbd2TU0AKgAAqjAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgIoJiQoS0dES3BpZXCclI6cs6qjs8m+tsnj
-187j7ODW7PPn3fP+7+X+/vDm/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5f706N/07eHY7eXa0OXN
-wbrNuK2muKGYkqF2cGt2U05KUy8tKy8FBAQFAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAABwcGBxIREBI8OTc8V1JPV3FqZnGRioSRpJuVpLatpbbOwrvO2c3E2eTXzuTx
-5Nrx9eje9fns4fn+7+b+/vDm/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5v757eL59unf9vLl2/Lm
-2dDm28/H28/Evc+7sai7qaCZqZaNiJZ1cGp1XFdTXEI+PEIWFRMWCgkJCgAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAEBAQEJCQgJGhkXGjEvLDGBe3aBs6qjs+DUzOD97+X9//Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn//7v5v7n3NLnu7Kru4uFfos5NTU5Hx0cHwoKCQoCAgICAQEBAQAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAADg0NDiQiISSLg36Lv7Stv+zf1uz36N/3+uzi+v3w5f3/8Of///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5//+8OX+++3j+/fq3/fw49rwx721x5iPiZgtKyotExISEwAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQ4
-NTM4YlxZYo2FgI3JvrbJ5djP5fzv5Pz/8Of///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//98Ob96dzT6dDEvNCUjYiUaWVgaT88Oj8I
-CAYIAgICAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBCAgHCBYVFBZ3
-cW13ua+pufTo3/T/8Ob///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5//57uL5xLqyxIeAe4cc
-GxkcDAsKDAICAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEYFxYYZ2FeZ7ivqLjz
-5dzz++3j+//w5v//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8Of//O3k/PXn3fXG
-vLXGdG5pdCMhHyMCAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwsKCx4cGx55c255r6afr+HVzeH9
-7+X9//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5v7o
-3dPourCouoZ9eYYmJSMmEA8PEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDHx4cH0VCP0Xc0cfc8+bc8//x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef/+Ovh+OXa0uVWUk5WKCYlKAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDAgMxLi0xi4R/i+TX0OT97uT9/vDm/v/x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn//7u5f7t4dbtmZGLmUM/PEMEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgkJChwaGRyJgnyJxLmyxPfq4Pf/8Of///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///w5//77uP7zsO6zpeQiZcmJCImDw4NDwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRgXGT47OT7h1svh9ene9f/x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef/+u3j+urf1epRTElRIyEgIwEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAODQwOb2lkb9LHv9L87eP8/vDm/v/x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn//3u5P3h1czhfHZwfBgXFhgBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAUFBQVVUUxVo5uUo+7h1+7+8Ob+//Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v/06N70sKigsGdiXWcHBwcHAQEBAQAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAgICAg4ODQ6impOi1crB1f/x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8Ob//+3i///q3///
-7eH//+/k///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef//+7j///q3///7N///+7j///x5///8ef///Hn///w5v//7OD//+vf///r4P//
-8Ob///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef/4dbN4bevqLcUExIUBAQEBAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAIyEgI1JNS1Lv4djv/O7k/P/x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5v//49P//7eY//+QYv//
-t5j//9XB///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef//76h//+NXv//pYD//8y1///x5///8ef///Hn///r4P//pH3//5lv//+bcP//
-69////Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//u/l/vPk2vNqZWJqMS4tMQAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAACAgICS0dES5qTjZr56uH5//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///r4P//sI3//4lZ//9rMv//
-spH//9S////x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+nd///f0P//0Lr//864///OuP//
-zrj//864///OuP//zrj//5px//9oLf//gU///6mF///OuP//zrj//864///Jsf//fkv//3U9//91P///
-ybD//864///OuP//zrj//864///OuP//zrj//9zL///s3///8Ob///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//rs4vqvpp+vWVVQWQgIBwgAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAALCgoLdW5qdeHVzOH97+X9//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+7j///j1P//eET//10d//9PCv//
-r43//9C6///r3///69///+vf///r3///69///+vf///r3///69///+vg///s4P//8Of///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+DQ///Mtf//p4P//6WA//+lgP//
-pYD//6WA//+lgP//pYD//3dB//9KBP//YST//4RT//+lgP//pYD//6WA//+gef//XyH//1UU//9WF///
-oHj//6WA//+lgP//pYD//6WA//+lgP//pYD//8Sp///k1P//8Ob///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7w5v7v4tnvgnx3ghYVFRYBAQEBAAAAAAAAAAAA
-AAAAAAAAAAUFBQVXU1BXrKOdrP3w5f3/8Of///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//8iw//+acf//Twr//04K//9XF///
-lmv//5x0//+edv//nnb//552//+edv//nnb//552//+edv//nnb//6B4//+ogv//7OD///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//8y1//+hev//UxD//00I//9NCP//
-TQj//00I//9NCP//TQj//0oE//9HAP//SQL//0sF//9NCP//TQj//00I//9NCP//SAH//0gB//9IAP//
-TQj//00I//9NCP//TQj//00I//9NCP//TQj//5Bi///UwP//7+T///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//+8Ob+u7Gpu3FrZnEHBwYHAAAAAAAAAAAA
-AAAAAAAAAAkJCAmUjIeUzsO7zv/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///u5P//0Ln//593//9tNv//SgP//0oE//9PDP//
-bTT//283//9vN///bzf//283//9vN///bzf//283//9vN///bzf//3Q8//+AS///6d3///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//97N///Hrv//n3b//5xy//+ccv//
-nHL//5xy//+ccv//nHL//3I6//9LBP//XiD//35K//+ccv//nHL//5xy//+YbP//XB3//1QS//9VFP//
-mGv//5xy//+ccv//nHL//4lY//9zPP//SgP//4xd///Tvv//7+T///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/2s/G2qqim6oPDg0PAgICAgAAAAAA
-AAAAAQEBARAQDxDNw7rN7ODW7P/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//+/k///o2v//p4T//3ZA//9KAv//Twz//1AM//9RDf//
-UQ3//1EN//9RDf//UQ3//1EN//9RDf//UQ3//04I//9KA///RwD//1AM//9iJf//59r///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///v5f//7OD//+vf///r3v//
-697//+ve///r3v//697//5tx//9NCP//dT7//7GQ///r3v//697//+ve///j0///cDj//2Ej//9jJf//
-4tL//+ve///r3v//697//8et//+cdf//TQf//4xd///Tvv//7+T///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5v//8Of///Dn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/9unf9t/Tyt8bGxgbBwcGBwAAAAAA
-AAAAGxoYG0M/PEPx49rx/u/m/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//9G6//+phf//VRH//1cW//9nLP//ybL//9bD///cy///
-3Mv//9zL///cy///3Mv//9zL///cy///2cf//6R///9tNP//SQP//3xG//+0k///7eH///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///t4v//tpX//62K//+ohP//
-qIT//6iE//+ohP//qIT//3hD//9KBP//YSX//4ZW//+ohP//qIT//6iE//+jff//YCH//1YU//9WF///
-o3z//6iE//+ohP//qIT//5Jm//96RP//SgT//4xd///Tvv//7+T///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//+7j///q4P//7uH//+/k///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//Tl3PRbV1RbKSYlKQAAAAAA
-AAAAMzAuM29qZW/26N72//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4v//xqv//552//93Qf//WRr//31K//+mg///4dH//+jb///r3///
-69///+vf///r3///69///+ve///n2f//tpf//4hY//9eH///czz//6R+///Vwf//7+T///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Dl///n2f//glD//3pE//94Q///
-fUn//31J//99Sf//fUn//2Il//9IAv//VRX//2kv//99Sf//fUn//31J//97Rf//VBP//08M//9QDP//
-ekX//31J//99Sf//fUn//3M7//9mK///UQz//5Fj///UwP//7+T///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//9zO///Esv//pY7//8e1///r4P//8Ob///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//jp4PiJg32JQT47QQAAAAAA
-AAAAS0dES52Wj5356uH5//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///w5///8OX//+zg///i0///lWj//2wy//9LBf//bTT//6mG///k1f//7+X///Dm///w5v//
-8Ob///Dm///w5v//8Ob//+vf///g0P//hlb//2Yq//9SD///oXv//8y1///w5v//8Ob///Dm///w5v//
-8Of///Dn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+3i///fz///UxD//04K//9UEf//
-XyD//2Ah//9fIf//YCD//1MQ//9HAP//Twv//1gW//9gIf//YCH//2Ah//9eH///Tgj//0oE//9LBf//
-Xh///2Ah//9gIf//YCH//2Ah//9gIf//YCH//5py///XxP//7+X///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//829//+jjP//Yj///5uC///Zzf//7uP///Dm///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//vs4/u4rqe4WlVSWgAAAAAA
-AAAAamRgatbLwtb97uX9//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///v5f//383//6qH//90P///Twr//1kZ//9uNv//0bz//+HS///r4P//7N///+zg///s4P//
-7OD//+zg///s3///6Nv//7WV//9/TP//Twr//3I6//+edv//4tL//+rd///s4P//7OD//+zg///s4P//
-7eD//+/j///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//9/P///Fq///Twv//3Q8//+kf///
-49T//+fa///m2f//28j//5Bk//9LBf//gE7//7WX///n2v//59r//+fa///fz///cDj//2Aj//9iJf//
-3s7//+fa///n2v//59r//+fa///n2v//59r//+vf///w5P//8Of///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//+/k///n2v//l4D//3NU//9cOf//0cH//+XZ///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5v7s4dfsd3FsdwMDAwMM
-CwsMe3Vwe+zg1uz+7+b+//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef//+7j///m2P//nHT//3lF//9bHP//WBb//1gW//9cHP//j2T//5Zt//+ZcP//mXD//5lw//+ZcP//
-mXD//5lw//+Zb///l27//3xJ//9fIv//SQL//10d//90P///l2z//5lw//+ZcP//mXD//5lw//+acf//
-pX///8uz///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//9bC//+zk///Tgn//2wy//+Uaf//
-vaH//8Cl//+/pP//s5H//3xI//9KBP//dT///5x0///Apf//wKX//8Cl//+5nf//Zin//1oa//9bG///
-uZz//8Cl///Apf//wKX//8Cl///Apf//wKX//8Cl///CqP//387//+nc///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///u5P//xrX//5+H//98X///jHD//7Wg///f0f//
-7+X///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5//36+D3iYJ8iRsaGRsb
-GRgbjYV/jf7x5/7/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef//+zf///dy///YiT//1QR//9QDf//azL//1ob//9HAP//SgP//0oF//9LBv//Swb//0sG//9LBv//
-Swb//0sE//9KA///RwD//0kB//9KA///Swb//0sG//9LBv//Swb//0sG//9LBv//Swb//0oD//9KA///
-Xh///6iE///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//822//+jff//UAv//2Ml//99SP//
-jV7//45f//+NXv//fUr//2El//9JA///aC3//3xH//+OX///jl///45f//+LW///WBb//1IO//9TEP//
-ilr//45f//+OX///jl///45f//+OX///jV7//4xd//+PYv//yrP//9/Q///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//9LC//+rlf//USv//4Vo///Csf//
-69///+/l///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/mpKNmjUzMjVA
-PTtAn5eRn//x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///r4P//sY///7GQ//+2lv//uZn//4BN//9KA///bjb//35L//+LXP//i1z//4tc//+LXP//
-i1z//35K//9tNv//SgP//10e//90Pv//ilr//4tc//+LXP//i1z//4tc//+LXP//i1z//3A3//9VE///
-XyD//6iE///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//8u0//+hfP//cz3//3E6//9yPP//
-cz7//3I8//9uN///Tgf//0sE//9NB///bjf//3I8//9zPv//cz7//3M+//9xO///UhD//04K//9PCf//
-cDv//3M+//9zPv//cz7//3M+//9yPf//aC7//1ka//9SEP//uJf//9jE///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+/l///p3v//vKn//4Fk//9QK///
-s57//9XG///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/rqWdrl1YU11W
-Uk5WqqGaqv/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///v5P//07///9S////Vwf//wKP//4JR//9MBv//jV///6mF///ApP//wKT//8Ck///ApP//
-wKT//6aB//+IWf//SwX//3E4//+ddP//vaH//8Ck///ApP//wKT//8Ck///ApP//wKT//49i//9gIP//
-XyH//6iE///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//97O///Ksv//spP//7GR//+wkP//
-ro3//5No//92QP//SgT//14f//95Rf//rYv//7GR//+xkf//sZH//7GR//+rif//YyX//1gX//9ZGP//
-q4n//7GR//+xkf//sZH//7GR//+ujf//jV7//2gt//9PCv//vqL//9vJ///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///v5f//28z//7Gb//+Ibf//
-f2D//6OM///Mu///7uT///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/ua+nuXJsZ3Jq
-ZWFqtKuktP/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4///wqX//4JR//9OCP//qYf//9C7///x5///8ef///Hn///x5///
-8ef//8uz//+ed///TQf//4NR///Dp///7eP///Hn///x5///8ef///Hn///x5///8ef//62K//9oLf//
-YCH//6iE///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5///8OX//+3j///r3///
-4NH//6+N//97R///Tgn//3hD//+qh///7OH///Hn///x5///8ef///Hn///o2///czv//2Il//9kJ///
-59r///Hn///v5f//6t7//+nd///l2P//rYj//3lC//9RDP//yLH//+HR///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+LV///Juf//
-WDX//3ZX//+hiP//5dr//+3j///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/w7mxw4aAeoZ8
-dnB8vbOrvf/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4///wqX//4JR//9OCP//qYf//9C7///x5///8ef///Hn///x5///
-8ef//8Sq//+SZ///TAb//4lZ///Ntf//7uT///Hn///x5///8ef///Hn///x5///8ef//62K//9oLf//
-YCH//6iE///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///v5f//383//8Gl//+gef//
-ZCX//1US//9PCv//hFP//7mb///s3///8Ob///Hn///x5///8ef///Hn///o2///czv//2Il//9kJ///
-59r//+7j///l1///jV7//4VT//+ATf//WBn//1ka//9mKv//49P//+7j///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Dm///u4///
-1cb//5V7//9aNv//jHL//8Cu///w5v//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/zMC5zJiPipiE
-fXeEwbevwf/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4///wqX//4JR//9OCP//qYf//9C7///x5///8ef///Hn///x5///
-8ef//72g//+EU///SwX//5Bi///axv//7+X///Hn///x5///8ef///Hn///x5///8ef//62K//9oLf//
-YCH//6iE///x5///8ef///Hn///x5///8ef///Hn///w5f//4dH//8Wr//+phP//kmf//4JR//9yO///
-ZCb//3Q8//+HV///u53//9fE///w5v//8ef///Hn///x5///8ef///Hn///q3v//lGj//4dX//+IWf//
-6t3//+/l///o2v//lWr//41e//+JWv//f03//5Bk//+mg///693///Dl///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5v//
-6Nz//8Kv//+agP//dFb//5Z9//++q///7eP///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/0MS80KCXkaCK
-g32KxLqyxP/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4///wqX//4JR//9NCP//p4T//822///s4f//7OH//+zh///s4f//
-7OH//7KS//91Pv//SgT//5Ro///g0f//7OD//+zh///s4f//7OH//+zh///s4f//7OH//6mH//9nLP//
-YCH//6iE///x5///8ef///Hn///x5///8ef///Hn///v5P//0r3//5pw//9iJf//Twn//0sF//9LBf//
-bDL//5Np//+8oP//5Nb//+fa///n2v//59r//+fa///n2v//59r//+fa///j1f//roz//6eC//+og///
-49T//+fa///i1P//oHn//5hu//+Va///rYn//8qz///o2///8Ob///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef//+vg///cz///Y0H//3BS//+OdP//6t////Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/08e/06adl6aK
-g32KxLqyxP/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4///wqX//4JR//9LBf//hlT//552//+zkv//s5L//7OS//+zkv//
-s5L//4VU//9WFf//Tgn//4BM//+ykf//s5L//7OS//+zkv//s5L//7OS//+zkv//s5L//4hX//9dHf//
-XyD//6iE///x5///8ef///Hn///x5///8ef///Hn///w5///7uH//7qc//+IWf//mXD//39M//9jJv//
-XyD//2Aj//9jJv//Zir//2Yq//9mKv//Zir//2Yq//9mKv//Zir//2Yq//9mKv//YiT//2Ek//9hJP//
-Zir//2Yq//9mKv//YSP//2Ej//9lKf//sI///9O+///w5v//8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef//9vN//+8qP//SiX//3te//+4pP//7eP///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/08e/06adl6aD
-fXeDwbevwf/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///t4///wqX//4JR//9JAv//ZSn//3E5//96Rv//ekb//3pG//96Rv//
-ekb//2Qo//9OCv//SgT//2Il//96Rv//ekb//3pG//96Rv//ekb//3pG//96Rv//ekb//2Uq//9SEP//
-Xx///6iE///x5///8ef///Hn///x5///8ef///Hn///x5///8OX//9bD//++of//x6///5hv//9oLv//
-VBL//2Ej//9uNf//bjX//241//9uNf//bjX//241//9uNf//bjX//241//9uNf//bjX//241//9uNf//
-bjX//241//9uNP//ZSr//1sc//9XGP//rIj//9G8///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///v5f//
-08P//6qT//+CZf//hGj//6yW///Wx///7+X///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/z8S8z5+XkZ98
-dW98vbOrvf/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///u4///xKj//4hX//9PCv//Twr//08K//9PCv//Twr//08K//9PCv//
-SgT//0gC//9HAP//TQj//00H//9MB///RwD//0oD//9MBv//Twr//08K//9PCv//Twr//08K//9RDP//
-ZCj//6uI///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//6+O//9rMf//
-TQj//2ku//+HV///h1f//4dX//+HV///h1f//4dX//+GVv//glH//4NT//+EVP//h1f//4dX//+HV///
-h1f//4dX//+GVf//dD3//10e//9NCP//qIP//8+5///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+7k///n3P//
-rZn//3pc//9TLv//wrD//93Q///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/zMC5zJiPiphq
-ZWFqtKuktP/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v//49T//9G8///Apf//wKX//8Cl///Apf//wKX//8Cl//+7nv//
-e0b//14g//9NB///nHX//5tz//+QZf//TAb//20z//+Vav//vaH//8Cl///Apf//wKX//8Cl///Apf//
-yK7//9zK///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//6+O//9sMf//
-UhL//552///q3f//6t3//+rd///q3f//6t3//+PU///axv//p4P//7eX///Msv//6Nv//+rd///q3f//
-6t3//+rd///n2f//up3//39N//9NCP//qIP//8+5///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//8m4//+bg///
-VS///45y///Ovv//7OH//+/l///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/w7mxw4aAeoZW
-UU5WqqGaqv/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v//7N///+TU///cy///3Mv//9zL///cy///3Mv//9bD///Jsv//
-azD//1wc//9bG///xKr//7mc//+hfP//TQj//3Y+//+ngv//2cb//9zL///cy///3Mv//9zL///cy///
-38///+jb///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//6+O//9sMf//
-UxL//6F7///x5///8ef///Hn///x5///8ef//+LS///Ntv//fEj//5Zt//+7nv//7eL///Hn///x5///
-8ef///Hn///t4v//wKT//4FQ//9NCP//qIP//8+5///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///t4v//v6z//5qB//96XP//
-knj//7uo///k1///8Ob///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/ua+ouXJsaHJA
-PTtAn5eRn//x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8Ob//+HR///Jsv//
-WBb//1sb//9wN///59j//9K9//+ujf//Tgn//3xH//+0lf//7eH///Hn///x5///8ef///Hn///x5///
-8ef///Dm///v5f//7+X///Dm///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//6+O//9sMf//
-UxL//6F7///x5///8ef///Hn///x5///8ef//9jG//+4mv//Tgr//3U+//+ohP//7OD///Hn///x5///
-8ef///Hn///t4v//wKT//4FQ//9NCP//qIP//8+5///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8Of//+vh///h1P//iW3//3FQ//9nRf//
-2Mr//+nd///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/rqWdrl1YU10b
-GRgbjYV/jf7x5/7/8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5v//7eD//6yK//9rMv//
-SQT//4RT///Eqf//7eP//9K///+ujf//Tgn//3xH//+0lf//7eH///Hn///x5///8ef///Hn///x5///
-8ef//+ja///fzf//387//+ja///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//6+O//9sMf//
-UxL//6F7///x5///8ef///Hn///x5///8ef//8mw//+acf//TQf//4NQ///Cpf//7eP///Hn///x5///
-8ef///Hn///t4v//wKT//4FQ//9NCP//qIP//8+5///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5///7eD//7Kc//93WP//aUj//6SN///h1P//
-7+X///Dm///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/mpKNmjUzMjUM
-DAsMe3Vxe+zh1+z+7+b+//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef//+7i///m2P//sY7//4JQ//9XGP//
-bDL//6V////ezP//7+X//9O///+ujf//Tgn//3xH//+0lf//7eH///Hn///x5///8ef///Hn///x5///
-8ef//9rJ///Apv//lWr//7eZ///fzv//7+X///Hn///x5///8ef///Hn///x5///8ef//6+O//9sMf//
-UxL//6F7///x5///8ef///Hn///x5///8Ob//7iZ//98Sf//Tgf//49i///Wwv//7+X///Hn///x5///
-8ef///Hn///t4v//wKT//4FQ//9NCP//qIP//8+5///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//+7k///n2v//qJP//4xy//94Wv//p5H//8u8///u4v//
-8Of///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5//46+H4iYJ9iRsaGRsA
-AAAAamRgatbLwtb97uX9//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5///7+P//+PV///Svv//czv//1wc//9RDP//
-k2j//8Sq///x5///8ef//9O///+ujf//Tgn//3xH//+0lf//7eH///Hn///x5///8ef///Hn///x5///
-8ef//863//+kf///TQj//4hY///MtP//7uT///Hn///x5///8ef///Hn///x5///8ef//7GQ//9uNv//
-Vxb//6N9///x5///8ef///Hn///w5v//7N///6aA//9fIP//UQ7//5x0///p3f//69///+3h///v4///
-7+b///Dm///t4///waX//4RT//9SDP//qYX//9C6///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//+bb///Uxf//aEf//3JR//+Ibf//6dz///Dl///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5v7s4dfsd3FsdwMDAwMA
-AAAAS0dES52Wj5356uH5//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///u5P//zLT//5dt//9jJv//SwX//2wy//+UaP//
-5Nf//+3i///x5///8ef//9O///+ujf//Tgn//3xH//+0lf//7eH///Hn///x5///8ef///Hn///x5///
-8ef//8iu//+Zbv//TAf//41f///Vwv//7+T///Hn///x5///8ef///Hn///x5///8ef//8Sr//+Wbf//
-h1X//7ud///x5///8ef///Hn///s4f//r43//3lF//9NB///f0z//7KS///cy///nHT//62K///Fqv//
-6dv//+7i///u5P//0Ln//6WA//+CUf//vqL//9rH///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//6yX//9pSf//i2///7uo///q3///7+b///Dn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//vs4/u4rqe4WlVSWgAAAAAA
-AAAAMzAuM3BqZnD26N72//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v//6Nr//9C6//+2l///iVv//201//9XFf//dj7//510///Fq///
-7eL///Dm///x5///8ef//9TA//+wj///Tgn//3dB//+sif//7OH///Hn///x5///8ef///Hn///x5///
-8ef//7+i//+IWP//TAb//5No///h0f//7+X///Hn///x5///8ef///Hn///x5///8ef//9vK///ErP//
-vqD//9fD///w5v//697//9bC//+9of//fEj//2Ml//9VEv//q4j//7ue///ApP//dT///3lF//+EVP//
-mnD//6eC//+zk///uZz//7WW//+zk///2cX//+bX///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//8q5//+kjf//v6z//9nK///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//jp4PiKg36KQj48QgAAAAAA
-AAAAGxoYG0M/PEPx49rx/u/m/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///w5///7+P//+vg///o2///1MD//6iE//95Rv//TQj//1AM//9cHP//qIL//8+4///x5///
-8ef///Hn///x5///8ef//9bC//+zk///Tgn//3A3//+edv//5Nb//+rd///q3f//6t3//+rd///q3f//
-6dz//7GP//91P///TQj//5ty///t4P//8Of///Hn///x5///8Ob//+/l///u5P//7uP//+3i///s4P//
-6+D//+re///n2///2cb//7OT//+KW///Tgr//1MR//9lKf//18P//8es//+phP//XR///1MR//9QCv//
-UAz//2Ik//90QP//nXT//7ud///XxP//6Nz//+vg///u4v//7+f///Dn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//+zh///o3P//8Ob///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//Tl3PRbV1RbKSYlKQAAAAAA
-AAAAAQEBARAQDxDNw7rN7ODW7P/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///u4///zbX//6iD//+DUP//VRT//04K//9OB///cTr//6N9///TwP//697//+7k///x5///
-8ef///Hn///x5///8ef//+DQ///Hrv//Twv//00H//9VE///f0v//4RT//+HV///h1f//4dX//+GVv//
-fUn//2Mm//9MBv//Ziv//6yK///w5v//8ef///Hn///w5v//5tf//9zI///Ruv//xav//7qd//+vjf//
-mG///4VV//9zO///VBL//08L//9OCP//ZSr//5pw///OuP//7eL//+7j///s4P//4tP//863//+3mf//
-jmH//3U///9eHv//Tgr//1AM//9WE///fkr//592//+/pP//6tv//+/j///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5v//8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/9unf9t/Tyt8bGxgbBwcGBwAAAAAA
-AAAAAAAAAAkJCAmUjIeUzsO7zv/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Dl///p2v//nHX//31K//9jJv//YST//3Q9//+KWv//sZD//822///n2f//8Ob///Hn///x5///
-8ef///Hn///x5///8ef//+nc///Zx///dT3//14e//9QC///XiH//2El//9jJ///Yyf//2Mn//9iJv//
-XyD//1kY//9YFf//lGr//8Sr///x5///8ef///Hn///v5P//0r7//62M//+LXP//hFP//35M//94RP//
-bTT//2ox//9oLv//ai///3hD//+JWf//qob//8eu///j1P//8Ob///Hn///w5///7+P//+PV///Yxf//
-waf//7OU//+lf///iFj//3U///9lKf//YiX//3A5//+FVP//zbf//+LS///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef/2s/G2qqimqoPDg4PAgICAgAAAAAA
-AAAAAAAAAAUFBQVXU1BXrKOdrP3w5f3/8Of///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef//+/k///k1f//dkH//18h//9UEf//fkv//6aA///NtP//7uT///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///r3///nnb//3lD//9aGP//UQ///1EO//9RDv//UQ7//1EO//9RDv//
-Ug///10e//9vNv//xKn//93M///x5///8ef///Hn///u4///xKj//4hW//9OCf//Twr//1AK//9QDP//
-Uw///2Ei//9xOP//kGP//66L///Ms///7eL///Dm///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///t4v//y7P//6iE//+FVf//WBf//1IO//9VE///t5f//9fE///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//+8Ob+u7Gpu3FrZnEHBwYHAAAAAAAAAAAA
-AAAAAAAAAAAAAAALCgoLdW5qdeHVzOH97+X9//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///u5P//2cT//9K8///PuP//59v//+zg///v4///8Of///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v//7OD//+jc///l2P//5NX//+TV///k1f//5NX//+TV///k1f//
-5db//+fY///o3P//7uL//+/l///x5///8ef///Hn///w5///7eH//8u1//+siv//uZv//8Ko///Ntv//
-38///+XW///o2///6t7//+zg///v4///7+f///Dn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///w5///7+P//+zg///p3P//2sj//8Sr//+zlP//6dz//+/k///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7w5v7v4tnvgnx3ghYVFRYBAQEBAAAAAAAAAAAA
-AAAAAAAAAAAAAAADAwMDTEhFTJqTjJr56uH5//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///w5v//6Nr//+XX///k1f//8Ob///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///v5v//8OX//+/l///v5f//7+X//+/l///w5f//
-7+X///Dm///x5///8ef///Hn///x5///8ef///Hn///x5///8Ob//+DR///Rvf//2cX//97M///i1P//
-7uH//+/k///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v//697//97O///Vwv//7+T///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//rs4vqvpqCvWVVSWQkICAkAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAIyEgI1JNS1Lv4djv/O7k/P/x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef//u/l/vPk2vNqZWJqMS4tMQAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAgICAg4ODQ6impOi1crB1f/x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef/4dbN4bevqLcUExIUBAQEBAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAUFBQVWUE1WpJuUpO7h2O7+8Ob+//Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5v/16N/1saehsWdhXmcHBwcHAQEBAQAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAODQwObmlkbtLHv9L77eP7/vDm/v/x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn//3u5P3h1czhfHZwfBgXFhgBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRgXGT47OT7h1svh9ene9f/x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef/+u3j+urf1epRTElRIyEgIwEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgkJChwaGRyJg32JxLqyxPfr4Pf/8Of///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///w5//77+T7zsK6zpePiZcnJCMnDw4ODwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDAgMxLi0xi4R/i+TX0OT97uT9/vDm/v/x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn//7u5f7t4dbtmZGLmUM/PEMEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDHx4cH0VCP0Xc0cfc8+bc8//x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef/+Ovh+OXa0uVWUk5WKCYlKAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwsKCx4cGx55c255sKefsOHWzeH+
-7+X+//Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5v7p
-3dPpubCouYV9eIUmJiMmEBAPEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEYFxYYZ2FeZ7mvqLnz
-5dzz++3j+//w5v//8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8Of//O3k/PXn3fXG
-vLXGdG5pdCMhHyMCAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBCAgHCBYVFBZ3
-cW13ua+pufTo3/T/8Ob///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5//57uL5xLqyxIeAe4cc
-GxocDAsLDAICAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQUFBQU4
-NTM4YlxZYoyFgIzKvrbK5djP5fzv5fz/8Of///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5//+8Ob+6dzT6dDFvNCVjYeVa2Vha0A8O0AI
-CAcIAgICAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAADg0NDiQiISSLg36Lv7Stv+zf1uz36N/3+uzi+v3w5f3/8Of///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///w5//+8OX+++3j+/fq3/fw49rwx721x5iPiZgtKyotExISEwAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAEBAQEJCQgJGhkXGjEvLDGBe3aBs6qjs+DUzOD97+X9//Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn//7v5v7n3NLnu7Kru4uFfos5NTU5Hx0cHwoKCQoCAgICAQEBAQAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAABwcGBxMREBM8Ojc8V1NPV3FqZnGSi4WSpp2WpriuprjOwrvO2c3F2eTYz+Tx
-5Nvx9enf9fnt4vn/8Of///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///w5//67eP69ung9vLl3fLm
-2tDm3NDH3NDEvdC7sam7qaCZqZeNiJd2cGt2XFhUXEI/PUIWFRQWCgkJCgAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgIoJiUoS0dFS3BpZXCclI6cs6qjs8m/t8nj
-187j7ODW7PPn3fP+7+X+/vDm/v/x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///
-8ef///Hn///x5///8ef///Hn///x5///8ef///Hn///x5///8ef///Hn//7v5f706N/07eHY7eXa0OXN
-wbrNuK2muKGYkqF2cGx2U05LUy8tKy8FBAQFAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-EgEAAAMAAAABAKUAAAEBAAMAAAABAEIAAAECAAMAAAAEAACrHgEDAAMAAAABAAEAAAEGAAMAAAABAAIA
-AAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAEIA
-AAEXAAQAAAABAACqKAEaAAUAAAABAACrDgEbAAUAAAABAACrFgEcAAMAAAABAAEAAAEoAAMAAAABAAIA
-AAFSAAMAAAABAAEAAAFTAAMAAAAEAACrJodzAAcAAAxIAACrLgAAAAAAAADYAAAAAQAAANgAAAABAAgA
-CAAIAAgAAQABAAEAAQAADEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAA
-AElFQyBzUkdCAAAAAAAAAAAAAAAAAAD21gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MAAAGEAAAAbHd0cHQAAAHwAAAA
-FGJrcHQAAAIEAAAAFHJYWVoAAAIYAAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAA
-cGRtZGQAAALEAAAAiHZ1ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAA
-JHRlY2gAAAQwAAAADHJUUkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29w
-eXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElF
-QzYxOTY2LTIuMQAAAAAAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAA
-AAAAAAAAAAAAWFlaIAAAAAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAk
-oAAAD4QAALbPZGVzYwAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0
-dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AGRlc2MAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAA
-AAAAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAA
-AAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4g
-SUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYx
-OTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQT
-CwADXJ4AAAABWFlaIAAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAC
-jwAAAAJzaWcgAAAAAENSVCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUA
-SgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA
-4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoB
-oQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqIC
-rAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kE
-BgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYF
-tQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wH
-vwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEK
-Jwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM
-8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQ
-JhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QT
-xRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X
-0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCoc
-Uhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwh
-SCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocm
-tyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4s
-oizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQz
-DTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5
-+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlB
-akGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1J
-Y0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR
-5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa
-9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBk
-lGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4Sbmtu
-xG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5
-iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE
-44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q
-1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPed
-ZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyq
-j6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4
-WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbG
-w8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V
-0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5Pzl
-hOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD1
-3vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//9ItLklKXk5TTXV0YWJsZUFycmF5o0k0
-MtVMTU5PD1BRUlNUV05TV2hpdGVcTlNDb21wb25lbnRzXE5TQ29sb3JTcGFjZV8QEk5TQ3VzdG9tQ29s
-b3JTcGFjZUQwIDAAQzAgMBADgBKAFdRWV1gPWVpbXFROU0lEVU5TSUNDV05TTW9kZWwQCYATEACAFE8R
-EZwAABGcYXBwbAIAAABtbnRyR1JBWVhZWiAH3AAIABcADwAuAA9hY3NwQVBQTAAAAABub25lAAAAAAAA
-AAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAVkZXNjAAAAwAAAAHlkc2NtAAABPAAACBpjcHJ0AAAJWAAAACN3dHB0AAAJfAAA
-ABRrVFJDAAAJkAAACAxkZXNjAAAAAAAAAB9HZW5lcmljIEdyYXkgR2FtbWEgMi4yIFByb2ZpbGUAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAAfAAAADHNrU0sAAAAuAAABhGRhREsAAAA6AAABsmNh
-RVMAAAA4AAAB7HZpVk4AAABAAAACJHB0QlIAAABKAAACZHVrVUEAAAAsAAACrmZyRlUAAAA+AAAC2mh1
-SFUAAAA0AAADGHpoVFcAAAAaAAADTGtvS1IAAAAiAAADZm5iTk8AAAA6AAADiGNzQ1oAAAAoAAADwmhl
-SUwAAAAkAAAD6nJvUk8AAAAqAAAEDmRlREUAAABOAAAEOGl0SVQAAABOAAAEhnN2U0UAAAA4AAAE1Hpo
-Q04AAAAaAAAFDGphSlAAAAAmAAAFJmVsR1IAAAAqAAAFTHB0UE8AAABSAAAFdm5sTkwAAABAAAAFyGVz
-RVMAAABMAAAGCHRoVEgAAAAyAAAGVHRyVFIAAAAkAAAGhmZpRkkAAABGAAAGqmhySFIAAAA+AAAG8HBs
-UEwAAABKAAAHLmFyRUcAAAAsAAAHeHJ1UlUAAAA6AAAHpGVuVVMAAAA8AAAH3gBWAWEAZQBvAGIAZQBj
-AG4A4QAgAHMAaQB2AOEAIABnAGEAbQBhACAAMgAsADIARwBlAG4AZQByAGkAcwBrACAAZwByAOUAIAAy
-ACwAMgAgAGcAYQBtAG0AYQAtAHAAcgBvAGYAaQBsAEcAYQBtAG0AYQAgAGQAZQAgAGcAcgBpAHMAbwBz
-ACAAZwBlAG4A6AByAGkAYwBhACAAMgAuADIAQx6lAHUAIABoAOwAbgBoACAATQDgAHUAIAB4AOEAbQAg
-AEMAaAB1AG4AZwAgAEcAYQBtAG0AYQAgADIALgAyAFAAZQByAGYAaQBsACAARwBlAG4A6QByAGkAYwBv
-ACAAZABhACAARwBhAG0AYQAgAGQAZQAgAEMAaQBuAHoAYQBzACAAMgAsADIEFwQwBDMEMAQ7BEwEPQQw
-ACAARwByAGEAeQAtBDMEMAQ8BDAAIAAyAC4AMgBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEAdQBl
-ACAAZwByAGkAcwAgAGcAYQBtAG0AYQAgADIALAAyAMEAbAB0AGEAbADhAG4AbwBzACAAcwB6APwAcgBr
-AGUAIABnAGEAbQBtAGEAIAAyAC4AMpAadShwcJaOUUlepgAyAC4AMoJyX2ljz4/wx3y8GAAg1ozAyQAg
-rBC5yAAgADIALgAyACDVBLhc0wzHfABHAGUAbgBlAHIAaQBzAGsAIABnAHIA5QAgAGcAYQBtAG0AYQAg
-ADIALAAyAC0AcAByAG8AZgBpAGwATwBiAGUAYwBuAOEAIAFhAGUAZADhACAAZwBhAG0AYQAgADIALgAy
-BdIF0AXeBdQAIAXQBeQF1QXoACAF2wXcBdwF2QAgADIALgAyAEcAYQBtAGEAIABnAHIAaQAgAGcAZQBu
-AGUAcgBpAGMBAwAgADIALAAyAEEAbABsAGcAZQBtAGUAaQBuAGUAcwAgAEcAcgBhAHUAcwB0AHUAZgBl
-AG4ALQBQAHIAbwBmAGkAbAAgAEcAYQBtAG0AYQAgADIALAAyAFAAcgBvAGYAaQBsAG8AIABnAHIAaQBn
-AGkAbwAgAGcAZQBuAGUAcgBpAGMAbwAgAGQAZQBsAGwAYQAgAGcAYQBtAG0AYQAgADIALAAyAEcAZQBu
-AGUAcgBpAHMAawAgAGcAcgDlACAAMgAsADIAIABnAGEAbQBtAGEAcAByAG8AZgBpAGxmbpAacHBepnz7
-ZXAAMgAuADJjz4/wZYdO9k4AgiwwsDDsMKQwrDDzMN4AIAAyAC4AMgAgMNcw7TDVMKEwpDDrA5MDtQO9
-A7kDugPMACADkwO6A8EDuQAgA5MDrAO8A7wDsQAgADIALgAyAFAAZQByAGYAaQBsACAAZwBlAG4A6QBy
-AGkAYwBvACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAIABkAGEAIABHAGEAbQBtAGEAIAAyACwAMgBB
-AGwAZwBlAG0AZQBlAG4AIABnAHIAaQBqAHMAIABnAGEAbQBtAGEAIAAyACwAMgAtAHAAcgBvAGYAaQBl
-AGwAUABlAHIAZgBpAGwAIABnAGUAbgDpAHIAaQBjAG8AIABkAGUAIABnAGEAbQBtAGEAIABkAGUAIABn
-AHIAaQBzAGUAcwAgADIALAAyDiMOMQ4HDioONQ5BDgEOIQ4hDjIOQA4BDiMOIg5MDhcOMQ5IDicORA4b
-ACAAMgAuADIARwBlAG4AZQBsACAARwByAGkAIABHAGEAbQBhACAAMgAsADIAWQBsAGUAaQBuAGUAbgAg
-AGgAYQByAG0AYQBhAG4AIABnAGEAbQBtAGEAIAAyACwAMgAgAC0AcAByAG8AZgBpAGkAbABpAEcAZQBu
-AGUAcgBpAQ0AawBpACAARwByAGEAeQAgAEcAYQBtAG0AYQAgADIALgAyACAAcAByAG8AZgBpAGwAVQBu
-AGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkAIABnAGEAbQBt
-AGEAIAAyACwAMgY6BicGRQYnACAAMgAuADIAIAZEBkgGRgAgBjEGRQYnBi8GSgAgBjkGJwZFBB4EMQRJ
-BDAETwAgBEEENQRABDAETwAgBDMEMAQ8BDwEMAAgADIALAAyAC0EPwRABD4ERAQ4BDsETABHAGUAbgBl
-AHIAaQBjACAARwByAGEAeQAgAEcAYQBtAG0AYQAgADIALgAyACAAUAByAG8AZgBpAGwAZQAAdGV4dAAA
-AABDb3B5cmlnaHQgQXBwbGUgSW5jLiwgMjAxMgAAWFlaIAAAAAAAAPNRAAEAAAABFsxjdXJ2AAAAAAAA
-BAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCL
-AJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQEr
-ATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIM
-AhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4
-A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2
-BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaM
-Bp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+
-CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtR
-C2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5J
-DmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGq
-EckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4
-FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3
-Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5q
-HpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOU
-I8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4
-KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9a
-L5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9
-Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0i
-PWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTO
-RRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0C
-TUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXC
-Vg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8P
-X2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjs
-aUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNd
-c7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5i
-fsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+
-imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0
-lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMG
-o3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1
-sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6E
-vv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01
-zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK
-3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG
-7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p
-/br+S/7c/23//9ItLl9gXE5TQ29sb3JTcGFjZaJhMlxOU0NvbG9yU3BhY2XSLS5jZFdOU0NvbG9yomMy
-0i0uZmdXTlNJbWFnZaJmMgAAAAgAAAARAAAAGgAAACQAAAApAAAAMgAAADcAAABJAAAATAAAAFEAAABT
-AAAAbQAAAHMAAACAAAAAhwAAAJYAAACdAAAAqgAAALEAAAC5AAAAuwAAAL0AAAC/AAAAxAAAAMYAAADI
-AAAA0QAAANYAAADhAAAA5QAAAOcAAADpAAAA6wAAAO0AAADyAAAA9QAAAPcAAAD5AAAA+wAAAQIAAAEZ
-AAABNQAAATcAAAE5AAAhSwAAIVAAACFbAAAhZAAAIXcAACF7AAAhhgAAIY8AACGUAAAhnAAAIZ8AACGk
-AAAhpwAAIakAACGrAAAhrQAAIbQAACG2AAAhuAAAeqoAAHqvAAB6sgAAerQAAHq2AAB6uAAAer8AAHrB
-AAB6wwABMj0AATJCAAEyUQABMlUAATJgAAEyaAABMnUAATKCAAEylwABMpwAATKgAAEyogABMqQAATKm
-AAEyrwABMrQAATK6AAEywgABMsQAATLGAAEyyAABMsoAAURqAAFEbwABRHwAAUR/AAFEjAABRJEAAUSZ
-AAFEnAABRKEAAUSpAAAAAAAABAEAAAAAAAAAaAAAAAAAAAAAAAAAAAABRKw
-</mutableData>
-        </image>
+        <image name="home_music_play" width="24" height="24"/>
         <image name="music_logo" width="41" height="40"/>
-        <image name="user_default_avatal" width="52" height="52"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MinePageSortView.h

@@ -0,0 +1,45 @@
+//
+//  MinePageSortView.h
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2022/9/7.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, MINEPAGESORT) {
+    MINEPAGESORT_TIME,    // 时间
+    MINEPAGESORT_SETTING, // 设置
+};
+
+// 课程类型
+typedef NS_ENUM(NSInteger, SORTVIEWTYPE) {
+    SORTVIEWTYPE_ACCOMPANY,
+    SORTVIEWTYPE_LIVE,
+    SORTVIEWTYPE_VIDEO,
+};
+
+typedef void(^MinePageSortCallback)(MINEPAGESORT type);
+
+@interface MinePageSortView : UIView
+
+@property (nonatomic, assign) SORTVIEWTYPE viewType;
+
+@property (weak, nonatomic) IBOutlet UILabel *sortTitleLabel;
+
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
+
+@property (weak, nonatomic) IBOutlet UILabel *actionLabel;
+
+
++ (instancetype)shareInstance;
+
+- (void)sortActionCallback:(MinePageSortCallback)callback;
+
++ (CGFloat)getViewHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MinePageSortView.m

@@ -0,0 +1,85 @@
+//
+//  MinePageSortView.m
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2022/9/7.
+//
+
+#import "MinePageSortView.h"
+
+@interface MinePageSortView ()
+
+@property (weak, nonatomic) IBOutlet UIView *timeView;
+
+@property (nonatomic, copy) MinePageSortCallback callback;
+
+@end
+
+@implementation MinePageSortView
+
++ (instancetype)shareInstance {
+    MinePageSortView *view = [[[NSBundle mainBundle] loadNibNamed:@"MinePageSortView" owner:nil options:nil] firstObject];
+    return view;
+}
+
+- (void)sortActionCallback:(MinePageSortCallback)callback {
+    if (callback) {
+        self.callback = callback;
+    }
+}
+
+- (IBAction)timeSort:(id)sender {
+    if (self.callback) {
+        self.callback(MINEPAGESORT_TIME);
+    }
+}
+
+- (IBAction)settingAction:(id)sender {
+    if (self.callback) {
+        self.callback(MINEPAGESORT_SETTING);
+    }
+}
+
++ (CGFloat)getViewHeight {
+    return 68.0f;
+}
+
+
+- (void)setViewType:(SORTVIEWTYPE)viewType {
+    _viewType = viewType;
+    switch (viewType) {
+        case SORTVIEWTYPE_ACCOMPANY:
+        {
+            self.sortTitleLabel.text = @"我的陪练课";
+            self.actionLabel.text = @"课程设置";
+            self.timeView.hidden = NO;
+        }
+            break;
+        case SORTVIEWTYPE_LIVE:
+        {
+            self.sortTitleLabel.text = @"我的直播课";
+            self.actionLabel.text = @"创建课程";
+            self.timeView.hidden = NO;
+        }
+            break;
+        case SORTVIEWTYPE_VIDEO:
+        {
+            self.sortTitleLabel.text = @"我的视频课";
+            self.actionLabel.text = @"创建课程";
+            self.timeView.hidden = YES;
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MinePageSortView.xib

@@ -0,0 +1,154 @@
+<?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">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <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="MinePageSortView">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="68"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fVx-q1-JTB">
+                    <rect key="frame" x="14" y="12" width="386" height="56"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的陪练课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="slc-nH-mRh">
+                            <rect key="frame" x="14" y="13" width="104" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="104" id="fMt-6o-p4k"/>
+                                <constraint firstAttribute="height" constant="30" id="gMQ-VO-Bhs"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gEl-xX-PfD">
+                            <rect key="frame" x="133" y="14" width="82" height="28"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="minePage_next" translatesAutoresizingMaskIntoConstraints="NO" id="ZlI-Tv-mag">
+                                    <rect key="frame" x="71" y="10.5" width="5" height="7"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="7" id="5Rg-bE-NaF"/>
+                                        <constraint firstAttribute="width" constant="5" id="G12-fi-geI"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2022-08" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tNT-Ml-8ea">
+                                    <rect key="frame" x="10" y="6.5" width="56" height="15"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
+                                    <color key="textColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R5g-7k-2Xr">
+                                    <rect key="frame" x="0.0" y="0.0" width="82" height="28"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <connections>
+                                        <action selector="timeSort:" destination="iN0-l3-epB" eventType="touchUpInside" id="rKz-vm-ixM"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="0.92549019607843142" green="1" blue="0.9882352941176471" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="trailing" secondItem="R5g-7k-2Xr" secondAttribute="trailing" id="4eF-RC-RbD"/>
+                                <constraint firstItem="ZlI-Tv-mag" firstAttribute="centerY" secondItem="gEl-xX-PfD" secondAttribute="centerY" id="5j3-7e-kCp"/>
+                                <constraint firstItem="R5g-7k-2Xr" firstAttribute="top" secondItem="gEl-xX-PfD" secondAttribute="top" id="8AV-Wl-a6S"/>
+                                <constraint firstAttribute="height" constant="28" id="POC-ID-Vez"/>
+                                <constraint firstAttribute="bottom" secondItem="R5g-7k-2Xr" secondAttribute="bottom" id="PcJ-TF-iXo"/>
+                                <constraint firstItem="tNT-Ml-8ea" firstAttribute="leading" secondItem="gEl-xX-PfD" secondAttribute="leading" constant="10" id="VuG-6f-dOU"/>
+                                <constraint firstItem="ZlI-Tv-mag" firstAttribute="leading" secondItem="tNT-Ml-8ea" secondAttribute="trailing" constant="5" id="a2L-YM-OUi"/>
+                                <constraint firstAttribute="trailing" secondItem="ZlI-Tv-mag" secondAttribute="trailing" constant="6" id="ji6-9n-WPc"/>
+                                <constraint firstItem="tNT-Ml-8ea" firstAttribute="centerY" secondItem="gEl-xX-PfD" secondAttribute="centerY" id="ubf-nk-Xb2"/>
+                                <constraint firstItem="R5g-7k-2Xr" firstAttribute="leading" secondItem="gEl-xX-PfD" secondAttribute="leading" id="wvZ-CD-UK1"/>
+                                <constraint firstAttribute="width" constant="82" id="yf8-Ga-JrU"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="6"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4GP-m2-xhT">
+                            <rect key="frame" x="287" y="14" width="85" height="28"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="minePage_next" translatesAutoresizingMaskIntoConstraints="NO" id="qvh-rp-hej">
+                                    <rect key="frame" x="80" y="10.5" width="5" height="7"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="7" id="8YK-KB-z2o"/>
+                                        <constraint firstAttribute="width" constant="5" id="kEq-KL-pNs"/>
+                                    </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="X0E-As-tIa">
+                                    <rect key="frame" x="8" y="4" width="66" height="20"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                    <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YCX-IX-iGM">
+                                    <rect key="frame" x="0.0" y="0.0" width="85" height="28"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <connections>
+                                        <action selector="settingAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="ymC-K3-QzI"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstItem="YCX-IX-iGM" firstAttribute="leading" secondItem="4GP-m2-xhT" secondAttribute="leading" id="6Dw-gp-ggB"/>
+                                <constraint firstItem="YCX-IX-iGM" firstAttribute="top" secondItem="4GP-m2-xhT" secondAttribute="top" id="8mV-lF-9Lw"/>
+                                <constraint firstItem="X0E-As-tIa" firstAttribute="leading" secondItem="4GP-m2-xhT" secondAttribute="leading" constant="8" id="FzM-4u-Rhi"/>
+                                <constraint firstAttribute="height" constant="28" id="Kqm-1Z-Ebn"/>
+                                <constraint firstAttribute="trailing" secondItem="qvh-rp-hej" secondAttribute="trailing" id="Vob-jm-pke"/>
+                                <constraint firstAttribute="bottom" secondItem="YCX-IX-iGM" secondAttribute="bottom" id="baN-Dw-xB7"/>
+                                <constraint firstItem="X0E-As-tIa" firstAttribute="centerY" secondItem="4GP-m2-xhT" secondAttribute="centerY" id="dND-Ks-SKd"/>
+                                <constraint firstItem="qvh-rp-hej" firstAttribute="centerY" secondItem="4GP-m2-xhT" secondAttribute="centerY" id="hlT-4q-HJd"/>
+                                <constraint firstAttribute="trailing" secondItem="YCX-IX-iGM" secondAttribute="trailing" id="k3N-vD-FTl"/>
+                                <constraint firstItem="qvh-rp-hej" firstAttribute="leading" secondItem="X0E-As-tIa" secondAttribute="trailing" constant="6" id="kDD-SG-nHD"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="4GP-m2-xhT" firstAttribute="centerY" secondItem="fVx-q1-JTB" secondAttribute="centerY" id="Svl-1r-vRd"/>
+                        <constraint firstItem="slc-nH-mRh" firstAttribute="centerY" secondItem="fVx-q1-JTB" secondAttribute="centerY" id="XNB-33-fse"/>
+                        <constraint firstAttribute="height" constant="56" id="ZkQ-gB-fNi"/>
+                        <constraint firstItem="gEl-xX-PfD" firstAttribute="centerY" secondItem="slc-nH-mRh" secondAttribute="centerY" id="clF-I3-Fz7"/>
+                        <constraint firstItem="gEl-xX-PfD" firstAttribute="leading" secondItem="slc-nH-mRh" secondAttribute="trailing" constant="15" id="kLo-NV-BBx"/>
+                        <constraint firstAttribute="trailing" secondItem="4GP-m2-xhT" secondAttribute="trailing" constant="14" id="mQU-25-EeX"/>
+                        <constraint firstItem="slc-nH-mRh" firstAttribute="leading" secondItem="fVx-q1-JTB" secondAttribute="leading" constant="14" id="rHh-Vt-Yv1"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="fVx-q1-JTB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="UcR-EM-4Tj"/>
+                <constraint firstAttribute="trailing" secondItem="fVx-q1-JTB" secondAttribute="trailing" constant="14" id="hr6-2E-zCc"/>
+                <constraint firstAttribute="bottom" secondItem="fVx-q1-JTB" secondAttribute="bottom" id="pPQ-Xv-Cj8"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="actionLabel" destination="X0E-As-tIa" id="k8U-1B-YxX"/>
+                <outlet property="sortTitleLabel" destination="slc-nH-mRh" id="Cud-ZF-0YU"/>
+                <outlet property="timeLabel" destination="tNT-Ml-8ea" id="QWS-Bw-NaD"/>
+                <outlet property="timeView" destination="gEl-xX-PfD" id="5bi-zE-F1l"/>
+            </connections>
+            <point key="canvasLocation" x="131.8840579710145" y="-205.24553571428569"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="minePage_next" width="5" height="7"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MusicSortView.h

@@ -0,0 +1,31 @@
+//
+//  MusicSortView.h
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2022/9/7.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, MUSICSORT) {
+    MUSICSORT_SUBJECT,
+    MUSICSORT_SEARCH,
+    MUSICSORT_UPLOAD,
+};
+
+typedef void(^MusicSortCallback)(MUSICSORT type, NSString * _Nullable searchKey);
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MusicSortView : UIView
+
+@property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
+
++ (instancetype)shareInstance;
+
+- (void)searchActionCallback:(MusicSortCallback)callback;
+
++ (CGFloat)getViewHeight;
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MusicSortView.m

@@ -0,0 +1,107 @@
+//
+//  MusicSortView.m
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2022/9/7.
+//
+
+#import "MusicSortView.h"
+
+@interface MusicSortView ()<UITextFieldDelegate>
+
+@property (weak, nonatomic) IBOutlet UIView *subjectView;
+
+@property (nonatomic, copy) MusicSortCallback callback;
+
+@property (weak, nonatomic) IBOutlet UITextField *searchField;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *searchLeft;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *subjectViewWidth;
+
+@end
+
+@implementation MusicSortView
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.searchField.delegate = self;
+    self.searchLeft.constant = 10.0f;
+    self.subjectViewWidth.constant = 82.0f;
+}
+
++ (instancetype)shareInstance {
+    MusicSortView *view = [[[NSBundle mainBundle] loadNibNamed:@"MusicSortView" owner:nil options:nil] firstObject];
+    return view;
+}
+
+- (void)searchActionCallback:(MusicSortCallback)callback {
+    if (callback) {
+        self.callback = callback;
+    }
+}
+
+- (IBAction)chooseSubject:(id)sender {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MUSICSORT_SUBJECT, nil);
+    }
+}
+
+- (IBAction)uploadAction:(id)sender {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MUSICSORT_UPLOAD, nil);
+    }
+}
+
+- (IBAction)searchAction:(id)sender {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MUSICSORT_SEARCH, self.searchField.text);
+    }
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MUSICSORT_SEARCH, textField.text);
+    }
+    return YES;
+}
+
+
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
+    [self subjectViewAnimation:YES];
+    return YES;
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    [self subjectViewAnimation:NO];
+}
+
+- (void)subjectViewAnimation:(BOOL)hidden {
+    [UIView animateWithDuration:0.3f animations:^{
+        if (hidden) {
+            self.subjectViewWidth.constant = 0.0f;
+            self.searchLeft.constant = 0.0f;
+        }
+        else {
+            self.subjectViewWidth.constant = 82.0f;
+            self.searchLeft.constant = 10.0f;
+        }
+        
+    }];
+}
+
++ (CGFloat)getViewHeight {
+    return 68.0f;
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MusicSortView.xib

@@ -0,0 +1,217 @@
+<?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">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <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="MusicSortView">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="85"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LYC-sp-mrk">
+                    <rect key="frame" x="14" y="29" width="386" height="56"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wjU-Jx-jhs">
+                            <rect key="frame" x="287" y="14" width="85" height="28"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="minePage_next" translatesAutoresizingMaskIntoConstraints="NO" id="cSb-1Y-cZk">
+                                    <rect key="frame" x="80" y="10.5" width="5" height="7"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="5" id="F38-Oq-ReW"/>
+                                        <constraint firstAttribute="height" constant="7" id="eIz-ou-mOi"/>
+                                    </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="EwU-GG-Z5j">
+                                    <rect key="frame" x="8" y="4" width="66" height="20"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                    <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fer-me-eAf">
+                                    <rect key="frame" x="0.0" y="0.0" width="85" height="28"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <connections>
+                                        <action selector="uploadAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="bcb-ss-Qyr"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstItem="fer-me-eAf" firstAttribute="top" secondItem="wjU-Jx-jhs" secondAttribute="top" id="I3R-T5-Z49"/>
+                                <constraint firstItem="EwU-GG-Z5j" firstAttribute="leading" secondItem="wjU-Jx-jhs" secondAttribute="leading" constant="8" id="TRp-AZ-xTD"/>
+                                <constraint firstAttribute="width" constant="85" id="WNk-FQ-EZH"/>
+                                <constraint firstItem="EwU-GG-Z5j" firstAttribute="centerY" secondItem="wjU-Jx-jhs" secondAttribute="centerY" id="Z82-am-Hwn"/>
+                                <constraint firstAttribute="trailing" secondItem="cSb-1Y-cZk" secondAttribute="trailing" id="bZv-ZY-OnS"/>
+                                <constraint firstItem="cSb-1Y-cZk" firstAttribute="centerY" secondItem="wjU-Jx-jhs" secondAttribute="centerY" id="bv5-2F-qFE"/>
+                                <constraint firstItem="cSb-1Y-cZk" firstAttribute="leading" secondItem="EwU-GG-Z5j" secondAttribute="trailing" constant="6" id="hSP-P9-zXx"/>
+                                <constraint firstAttribute="trailing" secondItem="fer-me-eAf" secondAttribute="trailing" id="kv6-3C-1tc"/>
+                                <constraint firstAttribute="bottom" secondItem="fer-me-eAf" secondAttribute="bottom" id="qfw-zc-nw6"/>
+                                <constraint firstAttribute="height" constant="28" id="wEj-VA-QRe"/>
+                                <constraint firstItem="fer-me-eAf" firstAttribute="leading" secondItem="wjU-Jx-jhs" secondAttribute="leading" id="zQ4-Uw-i8F"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CNp-VU-oG2">
+                            <rect key="frame" x="14" y="14" width="82" height="28"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="声部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoe-Vy-rkU">
+                                    <rect key="frame" x="13" y="5.5" width="49" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="uGk-aV-eyB">
+                                    <rect key="frame" x="67" y="11.5" width="7" height="5"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="7" id="K4X-qU-aSK"/>
+                                        <constraint firstAttribute="height" constant="5" id="gt2-Iv-KML"/>
+                                    </constraints>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Paf-ht-ThP">
+                                    <rect key="frame" x="0.0" y="0.0" width="82" height="28"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <connections>
+                                        <action selector="chooseSubject:" destination="iN0-l3-epB" eventType="touchUpInside" id="KJq-hh-0kw"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="bottom" secondItem="Paf-ht-ThP" secondAttribute="bottom" id="4h2-vm-AUc"/>
+                                <constraint firstAttribute="width" constant="82" id="80L-fE-nxc"/>
+                                <constraint firstAttribute="trailing" secondItem="uGk-aV-eyB" secondAttribute="trailing" constant="8" id="AMD-hJ-43b"/>
+                                <constraint firstItem="hoe-Vy-rkU" firstAttribute="centerY" secondItem="CNp-VU-oG2" secondAttribute="centerY" id="P64-LX-JYV"/>
+                                <constraint firstAttribute="height" constant="28" id="TCi-ah-HtO"/>
+                                <constraint firstItem="uGk-aV-eyB" firstAttribute="centerY" secondItem="CNp-VU-oG2" secondAttribute="centerY" id="X96-hH-Twm"/>
+                                <constraint firstItem="Paf-ht-ThP" firstAttribute="top" secondItem="CNp-VU-oG2" secondAttribute="top" id="Yty-cJ-lTf"/>
+                                <constraint firstAttribute="trailing" secondItem="Paf-ht-ThP" secondAttribute="trailing" id="cVs-3i-cYH"/>
+                                <constraint firstItem="uGk-aV-eyB" firstAttribute="leading" secondItem="hoe-Vy-rkU" secondAttribute="trailing" constant="5" id="wb8-k8-JfI"/>
+                                <constraint firstItem="Paf-ht-ThP" firstAttribute="leading" secondItem="CNp-VU-oG2" secondAttribute="leading" id="wr0-Kj-lnB"/>
+                                <constraint firstItem="hoe-Vy-rkU" firstAttribute="leading" secondItem="CNp-VU-oG2" secondAttribute="leading" constant="13" id="y6H-op-9oM"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="14"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vce-8A-wcI">
+                            <rect key="frame" x="106" y="14" width="158" height="28"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_green" translatesAutoresizingMaskIntoConstraints="NO" id="47X-Jq-fPP">
+                                    <rect key="frame" x="8" y="6" width="15" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="15" id="27u-WU-umh"/>
+                                        <constraint firstAttribute="height" constant="16" id="v8v-Nt-hwR"/>
+                                    </constraints>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NPf-j5-5aa">
+                                    <rect key="frame" x="121" y="1" width="37" height="26"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="37" id="Bve-td-Ts8"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <state key="normal" title="搜">
+                                        <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                    </state>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                            <real key="value" value="13"/>
+                                        </userDefinedRuntimeAttribute>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="3l1-Kb-UJ4"/>
+                                    </connections>
+                                </button>
+                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="曲目" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lY1-mR-Kgm">
+                                    <rect key="frame" x="34" y="0.0" width="85" height="28"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <textInputTraits key="textInputTraits" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
+                                </textField>
+                            </subviews>
+                            <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="bottom" secondItem="lY1-mR-Kgm" secondAttribute="bottom" id="GaV-ve-mM5"/>
+                                <constraint firstItem="NPf-j5-5aa" firstAttribute="top" secondItem="Vce-8A-wcI" secondAttribute="top" constant="1" id="PIQ-nD-Yxl"/>
+                                <constraint firstItem="lY1-mR-Kgm" firstAttribute="top" secondItem="Vce-8A-wcI" secondAttribute="top" id="Vqd-oH-Gyv"/>
+                                <constraint firstItem="47X-Jq-fPP" firstAttribute="centerY" secondItem="Vce-8A-wcI" secondAttribute="centerY" id="Xif-Ul-bFw"/>
+                                <constraint firstAttribute="bottom" secondItem="NPf-j5-5aa" secondAttribute="bottom" constant="1" id="cQ4-PH-bPO"/>
+                                <constraint firstItem="lY1-mR-Kgm" firstAttribute="leading" secondItem="47X-Jq-fPP" secondAttribute="trailing" constant="11" id="jK5-F9-Mdp"/>
+                                <constraint firstItem="47X-Jq-fPP" firstAttribute="leading" secondItem="Vce-8A-wcI" secondAttribute="leading" constant="8" id="m9Q-UP-EQz"/>
+                                <constraint firstAttribute="height" constant="28" id="sjh-vP-W18"/>
+                                <constraint firstAttribute="trailing" secondItem="NPf-j5-5aa" secondAttribute="trailing" id="vzy-Ec-isy"/>
+                                <constraint firstItem="NPf-j5-5aa" firstAttribute="leading" secondItem="lY1-mR-Kgm" secondAttribute="trailing" constant="2" id="wR4-Hn-Ft7"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="14"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="56" id="4E8-bd-Z7L"/>
+                        <constraint firstItem="wjU-Jx-jhs" firstAttribute="leading" secondItem="Vce-8A-wcI" secondAttribute="trailing" constant="23" id="CLA-R3-7kc"/>
+                        <constraint firstItem="CNp-VU-oG2" firstAttribute="centerY" secondItem="LYC-sp-mrk" secondAttribute="centerY" id="CN3-8O-soM"/>
+                        <constraint firstItem="Vce-8A-wcI" firstAttribute="leading" secondItem="CNp-VU-oG2" secondAttribute="trailing" constant="10" id="K6K-31-gYF"/>
+                        <constraint firstItem="wjU-Jx-jhs" firstAttribute="centerY" secondItem="LYC-sp-mrk" secondAttribute="centerY" id="byQ-lq-rSs"/>
+                        <constraint firstItem="Vce-8A-wcI" firstAttribute="centerY" secondItem="CNp-VU-oG2" secondAttribute="centerY" id="gJA-IP-9vN"/>
+                        <constraint firstItem="CNp-VU-oG2" firstAttribute="leading" secondItem="LYC-sp-mrk" secondAttribute="leading" constant="14" id="xUR-1U-ouI"/>
+                        <constraint firstAttribute="trailing" secondItem="wjU-Jx-jhs" secondAttribute="trailing" constant="14" id="z27-mj-ijy"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="LYC-sp-mrk" secondAttribute="bottom" id="JcW-xP-H6Z"/>
+                <constraint firstItem="LYC-sp-mrk" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="eGH-dX-npL"/>
+                <constraint firstAttribute="trailing" secondItem="LYC-sp-mrk" secondAttribute="trailing" constant="14" id="tEQ-Az-ljX"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="searchField" destination="lY1-mR-Kgm" id="7h4-Cg-iZb"/>
+                <outlet property="searchLeft" destination="K6K-31-gYF" id="Gfn-sD-I2Q"/>
+                <outlet property="subjectLabel" destination="hoe-Vy-rkU" id="p4j-Rk-3ro"/>
+                <outlet property="subjectView" destination="CNp-VU-oG2" id="TbF-T3-2UH"/>
+                <outlet property="subjectViewWidth" destination="80L-fE-nxc" id="GOO-m5-I2I"/>
+            </connections>
+            <point key="canvasLocation" x="131.8840579710145" y="96.09375"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="arrow_down" width="7" height="5"/>
+        <image name="minePage_next" width="5" height="7"/>
+        <image name="search_green" width="15" height="16"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoCell.m

@@ -13,12 +13,10 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *courseTitle;
 
-@property (weak, nonatomic) IBOutlet UIImageView *teacherAvatar;
-
-@property (weak, nonatomic) IBOutlet UILabel *teacherName;
-
 @property (weak, nonatomic) IBOutlet UILabel *courseMessage;
 
+@property (weak, nonatomic) IBOutlet UILabel *courseCount;
+
 @property (weak, nonatomic) IBOutlet UILabel *descLabel;
 
 @property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
@@ -35,18 +33,21 @@
 - (void)configSourceModel:(VideoCourseModel *)model {
     [self.coverImage sd_setImageWithURL:[NSURL URLWithString:[model.lessonCoverUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.courseTitle.text = [NSString returnNoNullStringWithString:model.lessonName];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
-    self.teacherName.text = [NSString returnNoNullStringWithString:model.username];
+   
+    if (model.lessonPrice > 0) {
+        self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f",model.lessonPrice];
+    }
+    else {
+        self.courseMessage.text = @"免费";
+    }
+
+    self.courseCount.text = [NSString stringWithFormat:@"/%.0f课时",model.lessonCount];
     if (model.lessonPrice > 0) {
-        self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.lessonPrice,model.lessonCount];
         self.descLabel.text = [NSString stringWithFormat:@"%.0f人已购买",model.countStudent];
     }
     else {
-        self.courseMessage.text = [NSString  stringWithFormat:@"免费/%.0f课时",model.lessonCount];
         self.descLabel.text = [NSString stringWithFormat:@"%.0f人已领取",model.countStudent];
     }
-
-    
     
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoCell.xib

@@ -28,7 +28,7 @@
                                 </constraints>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UwI-V7-ylA">
-                                <rect key="frame" x="8" y="6" width="24.5" height="13"/>
+                                <rect key="frame" x="176.5" y="93" width="24.5" height="13"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4gv-0P-tG8">
                                         <rect key="frame" x="3" y="0.0" width="18.5" height="13"/>
@@ -53,87 +53,52 @@
                                     </userDefinedRuntimeAttribute>
                                 </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="uOk-ia-Vh6">
-                                <rect key="frame" x="11" y="117" width="185" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛视频课" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uOk-ia-Vh6">
+                                <rect key="frame" x="11" y="117" width="183" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥120/4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3y-Mv-wxM">
-                                <rect key="frame" x="9" y="164" width="81" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="￥120" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3y-Mv-wxM">
+                                <rect key="frame" x="12" y="160" width="41" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="e27-SE-MGk"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                                <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="yqj-pv-E9y">
-                                <rect key="frame" x="11" y="139" width="20" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="20" id="10h-7R-s14"/>
-                                    <constraint firstAttribute="height" constant="20" id="aYV-dF-zgt"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="10"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nwj-Ef-Sig">
-                                <rect key="frame" x="36" y="141.5" width="37" height="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1HX-v1-naa">
+                                <rect key="frame" x="12" y="181" width="57" height="15"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <color key="textColor" red="1" green="0.50196078430000002" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mbx-Mx-WUq">
+                                <rect key="frame" x="61" y="161.5" width="42" height="17"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e8Z-Ri-oh9">
-                                <rect key="frame" x="79" y="139" width="118" height="20"/>
-                                <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I0Q-VW-orJ">
-                                        <rect key="frame" x="0.0" y="4.5" width="1" height="11"/>
-                                        <color key="backgroundColor" red="0.82745098039999998" green="0.82745098039999998" blue="0.82745098039999998" alpha="1" colorSpace="calibratedRGB"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="11" id="ZRv-4m-ap6"/>
-                                            <constraint firstAttribute="width" constant="1" id="b2J-4G-YmJ"/>
-                                        </constraints>
-                                    </view>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1HX-v1-naa">
-                                        <rect key="frame" x="7" y="2.5" width="57" height="15"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                        <color key="textColor" red="1" green="0.50196078430000002" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstItem="1HX-v1-naa" firstAttribute="centerY" secondItem="e8Z-Ri-oh9" secondAttribute="centerY" id="2td-qT-bcq"/>
-                                    <constraint firstItem="I0Q-VW-orJ" firstAttribute="leading" secondItem="e8Z-Ri-oh9" secondAttribute="leading" id="O00-V9-BYJ"/>
-                                    <constraint firstItem="1HX-v1-naa" firstAttribute="leading" secondItem="I0Q-VW-orJ" secondAttribute="trailing" constant="6" id="dM1-NL-96t"/>
-                                    <constraint firstItem="I0Q-VW-orJ" firstAttribute="centerY" secondItem="e8Z-Ri-oh9" secondAttribute="centerY" id="hbp-wS-HxG"/>
-                                    <constraint firstAttribute="height" constant="20" id="oJh-du-d2B"/>
-                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1HX-v1-naa" secondAttribute="trailing" constant="2" id="rS8-RP-vfC"/>
-                                </constraints>
-                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="Mbx-Mx-WUq" firstAttribute="leading" secondItem="W3y-Mv-wxM" secondAttribute="trailing" constant="8" id="0KC-St-V0b"/>
                             <constraint firstItem="uOk-ia-Vh6" firstAttribute="top" secondItem="U59-Pt-Ft1" secondAttribute="bottom" constant="6" id="1pe-xh-lmN"/>
                             <constraint firstAttribute="trailing" secondItem="U59-Pt-Ft1" secondAttribute="trailing" id="4Dp-mH-SWc"/>
-                            <constraint firstItem="UwI-V7-ylA" firstAttribute="leading" secondItem="U59-Pt-Ft1" secondAttribute="leading" constant="8" id="8W4-IQ-qBy"/>
-                            <constraint firstItem="yqj-pv-E9y" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" constant="11" id="8kQ-Qp-GAi"/>
-                            <constraint firstItem="yqj-pv-E9y" firstAttribute="top" secondItem="uOk-ia-Vh6" secondAttribute="bottom" constant="5" id="AJV-xP-ti7"/>
-                            <constraint firstItem="Nwj-Ef-Sig" firstAttribute="leading" secondItem="yqj-pv-E9y" secondAttribute="trailing" constant="5" id="Hbg-5d-IwB"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1HX-v1-naa" secondAttribute="trailing" constant="14" id="8Y8-61-Q3f"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Mbx-Mx-WUq" secondAttribute="trailing" constant="12" id="GWl-77-zOq"/>
                             <constraint firstItem="U59-Pt-Ft1" firstAttribute="top" secondItem="RA1-Ms-Rdt" secondAttribute="top" id="JRf-z3-v3b"/>
+                            <constraint firstItem="1HX-v1-naa" firstAttribute="top" secondItem="W3y-Mv-wxM" secondAttribute="bottom" constant="1" id="OPI-20-hwd"/>
+                            <constraint firstItem="1HX-v1-naa" firstAttribute="leading" secondItem="W3y-Mv-wxM" secondAttribute="leading" id="PDL-BV-9X0"/>
+                            <constraint firstItem="UwI-V7-ylA" firstAttribute="bottom" secondItem="U59-Pt-Ft1" secondAttribute="bottom" constant="-5" id="ROV-Ku-hBb"/>
                             <constraint firstItem="uOk-ia-Vh6" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" constant="11" id="RTH-lX-k5P"/>
-                            <constraint firstAttribute="trailing" secondItem="uOk-ia-Vh6" secondAttribute="trailing" constant="11" id="S4V-XM-Vxi"/>
+                            <constraint firstAttribute="trailing" secondItem="uOk-ia-Vh6" secondAttribute="trailing" constant="13" id="S4V-XM-Vxi"/>
                             <constraint firstItem="U59-Pt-Ft1" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" id="UyZ-0m-Zce"/>
-                            <constraint firstItem="e8Z-Ri-oh9" firstAttribute="leading" secondItem="Nwj-Ef-Sig" secondAttribute="trailing" constant="6" id="Y31-jU-l4B"/>
-                            <constraint firstAttribute="trailing" secondItem="e8Z-Ri-oh9" secondAttribute="trailing" constant="10" id="ctU-1d-uaS"/>
-                            <constraint firstItem="W3y-Mv-wxM" firstAttribute="top" secondItem="yqj-pv-E9y" secondAttribute="bottom" constant="5" id="e3y-jZ-ZPa"/>
-                            <constraint firstItem="Nwj-Ef-Sig" firstAttribute="centerY" secondItem="yqj-pv-E9y" secondAttribute="centerY" id="lOz-ZL-BdG"/>
-                            <constraint firstItem="UwI-V7-ylA" firstAttribute="top" secondItem="U59-Pt-Ft1" secondAttribute="top" constant="6" id="mtN-nv-Jk1"/>
-                            <constraint firstItem="e8Z-Ri-oh9" firstAttribute="centerY" secondItem="Nwj-Ef-Sig" secondAttribute="centerY" id="wg1-be-1hH"/>
-                            <constraint firstItem="W3y-Mv-wxM" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" constant="9" id="xR2-mV-JFQ"/>
+                            <constraint firstItem="W3y-Mv-wxM" firstAttribute="top" secondItem="U59-Pt-Ft1" secondAttribute="bottom" constant="49" id="jk7-MS-wHh"/>
+                            <constraint firstItem="Mbx-Mx-WUq" firstAttribute="centerY" secondItem="W3y-Mv-wxM" secondAttribute="centerY" id="kcQ-QE-lJh"/>
+                            <constraint firstAttribute="trailing" secondItem="UwI-V7-ylA" secondAttribute="trailing" constant="6" id="tge-Wr-QAs"/>
+                            <constraint firstItem="W3y-Mv-wxM" firstAttribute="leading" secondItem="RA1-Ms-Rdt" secondAttribute="leading" constant="12" id="xR2-mV-JFQ"/>
                         </constraints>
                     </view>
                 </subviews>
@@ -152,19 +117,17 @@
                 </userDefinedRuntimeAttribute>
             </userDefinedRuntimeAttributes>
             <connections>
+                <outlet property="courseCount" destination="Mbx-Mx-WUq" id="nfx-dV-JPo"/>
                 <outlet property="courseMessage" destination="W3y-Mv-wxM" id="Nsr-uP-v89"/>
                 <outlet property="courseTitle" destination="uOk-ia-Vh6" id="vHO-8t-9sg"/>
                 <outlet property="coverImage" destination="U59-Pt-Ft1" id="46O-sh-EXw"/>
                 <outlet property="descLabel" destination="1HX-v1-naa" id="RbV-LD-Rl1"/>
                 <outlet property="subjectLabel" destination="4gv-0P-tG8" id="ZbB-cP-L8Y"/>
-                <outlet property="teacherAvatar" destination="yqj-pv-E9y" id="zcT-kt-aqU"/>
-                <outlet property="teacherName" destination="Nwj-Ef-Sig" id="gQl-V3-DUn"/>
             </connections>
             <point key="canvasLocation" x="245.6521739130435" y="142.96875"/>
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="user_default_avatal" width="52" height="52"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoView.m

@@ -13,6 +13,7 @@
 #import "MinePageSubmitView.h"
 #import "KSBaseWKWebViewController.h"
 #import "AuthDisplayView.h"
+#import "MinePageSortView.h"
 
 @interface MinePageVideoView ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
 
@@ -27,7 +28,7 @@
 @property (nonatomic, assign) NSInteger rows;
 @property (nonatomic, assign) NSInteger pages;
 
-@property (nonatomic, strong) MinePageSubmitView *uploadView;
+@property (nonatomic, strong) MinePageSortView *sortView;
 
 @property (nonatomic, strong) AuthDisplayView *authView;
 
@@ -42,7 +43,7 @@
     if (self) {
         self.backgroundColor = HexRGB(0xf6f8f9);
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionInset = UIEdgeInsetsMake(0, 14, 12, 14);
+        layout.sectionInset = UIEdgeInsetsMake(12, 14, 12, 14);
         
         self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, frame.size.height) collectionViewLayout:layout];
         self.collectionView.backgroundColor = HexRGB(0xf6f8f9);
@@ -141,11 +142,10 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    CGFloat topHeight = 60.0f;
+    CGFloat topHeight = [MinePageSortView getViewHeight];
     self.collectionView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
-    if (![self.subviews containsObject:self.uploadView]) {
-        [self addSubview:self.uploadView];
-        self.uploadView.type = MINEPAGETYPE_VIDEO;
+    if (![self.subviews containsObject:self.sortView]) {
+        [self addSubview:self.sortView];
         if (self.authStatus == NO) {
             [self showAuthView];
         }
@@ -185,7 +185,7 @@
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, 200);
+    return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, 210);
 }
 /**
  设置没有数据时的显示
@@ -309,17 +309,43 @@
         self.authView = nil;
     }
 }
-- (MinePageSubmitView *)uploadView {
-    if (!_uploadView) {
-        _uploadView = [MinePageSubmitView shareInstance];
-        CGFloat topHeight = 60.0f;
-        _uploadView.frame = CGRectMake(0, 0, kScreenWidth, topHeight);
+
+
+- (MinePageSortView *)sortView {
+    if (!_sortView) {
+        _sortView = [MinePageSortView shareInstance];
+        _sortView.viewType = SORTVIEWTYPE_VIDEO;
+        CGFloat topHeight = [MinePageSortView getViewHeight];
+        _sortView.frame = CGRectMake(0, 0, KPortraitWidth, topHeight);
         MJWeakSelf;
-        [_uploadView opreationCallback:^(MINEPAGETYPE type) {
-            [weakSelf uploadAciton:type];
+        [_sortView sortActionCallback:^(MINEPAGESORT type) {
+            [weakSelf sortViewAction:type];
         }];
     }
-    return _uploadView;
+    return _sortView;
+}
+
+- (void)sortViewAction:(MINEPAGESORT)type {
+    switch (type) {
+        case MINEPAGESORT_TIME:
+        {
+//            [self showPickerView];
+        }
+            break;
+        case MINEPAGESORT_SETTING:
+        {
+            [self settingAction];
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)settingAction {
+    KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+    webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/videoCreate"];
+    [self.naviController pushViewController:webCtrl animated:YES];
 }
 
 - (AuthDisplayView *)authView {
@@ -339,13 +365,6 @@
     [self.naviController pushViewController:webCtrl animated:YES];
 }
 
-- (void)uploadAciton:(MINEPAGETYPE)type {
-    if (type == MINEPAGETYPE_VIDEO) {
-        KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-        webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/videoCreate"];
-        [self.naviController pushViewController:webCtrl animated:YES];
-    }
-}
 - (NSMutableArray *)dataArray {
     if (!_dataArray) {
         _dataArray = [NSMutableArray array];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineVideoCell.xib

@@ -21,15 +21,12 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kbc-sU-aNo">
                         <rect key="frame" x="14" y="0.0" width="345" height="248"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_video" translatesAutoresizingMaskIntoConstraints="NO" id="HQf-zf-VPg">
-                                <rect key="frame" x="12" y="14" width="24" height="24"/>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="老师风采" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GKG-Y1-2TR">
-                                <rect key="frame" x="39" y="11" width="66" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="达人风采" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GKG-Y1-2TR">
+                                <rect key="frame" x="14" y="11" width="73.5" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="gXX-Yw-50s"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                <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="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -43,14 +40,11 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="HQf-zf-VPg" firstAttribute="leading" secondItem="Kbc-sU-aNo" secondAttribute="leading" constant="12" id="3Si-q4-Eg9"/>
-                            <constraint firstItem="GKG-Y1-2TR" firstAttribute="centerY" secondItem="HQf-zf-VPg" secondAttribute="centerY" id="7H4-kZ-i0K"/>
-                            <constraint firstItem="GKG-Y1-2TR" firstAttribute="leading" secondItem="HQf-zf-VPg" secondAttribute="trailing" constant="3" id="FNZ-9y-D1x"/>
+                            <constraint firstItem="GKG-Y1-2TR" firstAttribute="leading" secondItem="Kbc-sU-aNo" secondAttribute="leading" constant="14" id="Hks-Y0-o7I"/>
                             <constraint firstItem="5jL-Cm-W81" firstAttribute="top" secondItem="GKG-Y1-2TR" secondAttribute="bottom" constant="20" id="MRu-mO-Pan"/>
                             <constraint firstAttribute="trailing" secondItem="5jL-Cm-W81" secondAttribute="trailing" constant="14" id="NmJ-0j-yfj"/>
                             <constraint firstAttribute="bottom" secondItem="5jL-Cm-W81" secondAttribute="bottom" constant="20" id="Sb3-sC-RcP"/>
                             <constraint firstItem="5jL-Cm-W81" firstAttribute="leading" secondItem="Kbc-sU-aNo" secondAttribute="leading" constant="14" id="mqo-5J-vfY"/>
-                            <constraint firstItem="HQf-zf-VPg" firstAttribute="top" secondItem="Kbc-sU-aNo" secondAttribute="top" constant="14" id="tAD-Eu-T9B"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -60,6 +54,7 @@
                     </view>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="Kbc-sU-aNo" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="7dE-kP-yzQ"/>
                     <constraint firstAttribute="bottom" secondItem="Kbc-sU-aNo" secondAttribute="bottom" constant="12" id="a7c-2h-LKG"/>
                     <constraint firstItem="Kbc-sU-aNo" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="ey0-Dm-4DM"/>
                     <constraint firstAttribute="trailing" secondItem="Kbc-sU-aNo" secondAttribute="trailing" constant="14" id="lMX-4o-zeX"/>
@@ -76,7 +71,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="mine_video" width="24" height="24"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.m

@@ -73,6 +73,7 @@
             self.actionView.hidden = NO;
             if (hideBottomView) {
                 self.actionView.hidden = YES;
+                self.statusView.hidden = YES;
             }
             else {
                 self.actionViewHeight.constant = 40.0f;
@@ -80,6 +81,7 @@
                 self.actionLabel.text = @"下架此课程";
                 [self.actionImage setImage:[UIImage imageNamed:@"unshelve_course"]];
                 self.descLabel.hidden = NO;
+                self.statusView.hidden = NO;
             }
             
         }
@@ -102,7 +104,7 @@
             self.actionViewHeight.constant = 40.0f;
             self.actionLabel.textColor = HexRGB(0xFF4E19);
             self.actionLabel.text = @"重新编辑";
-            [self.actionImage setImage:[UIImage imageNamed:@"racking_course"]];
+            [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];
             self.descLabel.hidden = NO;
         }
             break;