Steven 3 年之前
父节点
当前提交
03daacdf0d

+ 10 - 0
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -503,6 +503,8 @@
 		BC3ACD972890D61400060E97 /* NoRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3ACD962890D61400060E97 /* NoRecordViewController.m */; };
 		BC3ACD972890D61400060E97 /* NoRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3ACD962890D61400060E97 /* NoRecordViewController.m */; };
 		BC3ACD9A2890D88600060E97 /* IncomeRecordHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3ACD992890D88600060E97 /* IncomeRecordHeadView.m */; };
 		BC3ACD9A2890D88600060E97 /* IncomeRecordHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3ACD992890D88600060E97 /* IncomeRecordHeadView.m */; };
 		BC3ACD9C2890D88E00060E97 /* IncomeRecordHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC3ACD9B2890D88E00060E97 /* IncomeRecordHeadView.xib */; };
 		BC3ACD9C2890D88E00060E97 /* IncomeRecordHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC3ACD9B2890D88E00060E97 /* IncomeRecordHeadView.xib */; };
+		BC3ACD9F2891261800060E97 /* MyMusicNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3ACD9E2891261800060E97 /* MyMusicNavView.m */; };
+		BC3ACDA12891261F00060E97 /* MyMusicNavView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC3ACDA02891261F00060E97 /* MyMusicNavView.xib */; };
 		BC3DE082280D88670027DC0E /* EvaluateListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3DE081280D88670027DC0E /* EvaluateListModel.m */; };
 		BC3DE082280D88670027DC0E /* EvaluateListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3DE081280D88670027DC0E /* EvaluateListModel.m */; };
 		BC3DE088280D89E90027DC0E /* EvaluateDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3DE087280D89E90027DC0E /* EvaluateDetailViewController.m */; };
 		BC3DE088280D89E90027DC0E /* EvaluateDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3DE087280D89E90027DC0E /* EvaluateDetailViewController.m */; };
 		BC4058922863028200111BC5 /* NotiferNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC4058912863028200111BC5 /* NotiferNavView.m */; };
 		BC4058922863028200111BC5 /* NotiferNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC4058912863028200111BC5 /* NotiferNavView.m */; };
@@ -1844,6 +1846,9 @@
 		BC3ACD982890D88600060E97 /* IncomeRecordHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IncomeRecordHeadView.h; sourceTree = "<group>"; };
 		BC3ACD982890D88600060E97 /* IncomeRecordHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IncomeRecordHeadView.h; sourceTree = "<group>"; };
 		BC3ACD992890D88600060E97 /* IncomeRecordHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IncomeRecordHeadView.m; sourceTree = "<group>"; };
 		BC3ACD992890D88600060E97 /* IncomeRecordHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IncomeRecordHeadView.m; sourceTree = "<group>"; };
 		BC3ACD9B2890D88E00060E97 /* IncomeRecordHeadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IncomeRecordHeadView.xib; sourceTree = "<group>"; };
 		BC3ACD9B2890D88E00060E97 /* IncomeRecordHeadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IncomeRecordHeadView.xib; sourceTree = "<group>"; };
+		BC3ACD9D2891261800060E97 /* MyMusicNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyMusicNavView.h; sourceTree = "<group>"; };
+		BC3ACD9E2891261800060E97 /* MyMusicNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyMusicNavView.m; sourceTree = "<group>"; };
+		BC3ACDA02891261F00060E97 /* MyMusicNavView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyMusicNavView.xib; sourceTree = "<group>"; };
 		BC3DE080280D88660027DC0E /* EvaluateListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EvaluateListModel.h; sourceTree = "<group>"; };
 		BC3DE080280D88660027DC0E /* EvaluateListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EvaluateListModel.h; sourceTree = "<group>"; };
 		BC3DE081280D88670027DC0E /* EvaluateListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EvaluateListModel.m; sourceTree = "<group>"; };
 		BC3DE081280D88670027DC0E /* EvaluateListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EvaluateListModel.m; sourceTree = "<group>"; };
 		BC3DE086280D89E90027DC0E /* EvaluateDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EvaluateDetailViewController.h; sourceTree = "<group>"; };
 		BC3DE086280D89E90027DC0E /* EvaluateDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EvaluateDetailViewController.h; sourceTree = "<group>"; };
@@ -4373,6 +4378,9 @@
 				BCB9FA4B28717BB1005D766B /* MyMusicSearchView.h */,
 				BCB9FA4B28717BB1005D766B /* MyMusicSearchView.h */,
 				BCB9FA4C28717BB1005D766B /* MyMusicSearchView.m */,
 				BCB9FA4C28717BB1005D766B /* MyMusicSearchView.m */,
 				BCB9FA4E28717BBD005D766B /* MyMusicSearchView.xib */,
 				BCB9FA4E28717BBD005D766B /* MyMusicSearchView.xib */,
+				BC3ACD9D2891261800060E97 /* MyMusicNavView.h */,
+				BC3ACD9E2891261800060E97 /* MyMusicNavView.m */,
+				BC3ACDA02891261F00060E97 /* MyMusicNavView.xib */,
 			);
 			);
 			path = View;
 			path = View;
 			sourceTree = "<group>";
 			sourceTree = "<group>";
@@ -6512,6 +6520,7 @@
 				BC71D1332887ADDA0010F14B /* teacher_refresh.json in Resources */,
 				BC71D1332887ADDA0010F14B /* teacher_refresh.json in Resources */,
 				BC7CFFCA2817F2FF00CAEB21 /* CashRecordListCell.xib in Resources */,
 				BC7CFFCA2817F2FF00CAEB21 /* CashRecordListCell.xib in Resources */,
 				BCB9FA41286DA337005D766B /* GuideListView.xib in Resources */,
 				BCB9FA41286DA337005D766B /* GuideListView.xib in Resources */,
+				BC3ACDA12891261F00060E97 /* MyMusicNavView.xib in Resources */,
 				BCB908DD2850A71800F5FF69 /* ShareMusicCellContentView.xib in Resources */,
 				BCB908DD2850A71800F5FF69 /* ShareMusicCellContentView.xib in Resources */,
 				BC71D2062887FDD40010F14B /* img_23.png in Resources */,
 				BC71D2062887FDD40010F14B /* img_23.png in Resources */,
 				27D83F5927F4225D00062476 /* LivePreviewBodyView.xib in Resources */,
 				27D83F5927F4225D00062476 /* LivePreviewBodyView.xib in Resources */,
@@ -7285,6 +7294,7 @@
 				2779327027E30FD80010E277 /* FSCalendarTransitionCoordinator.m in Sources */,
 				2779327027E30FD80010E277 /* FSCalendarTransitionCoordinator.m in Sources */,
 				BCC9F42C27F69BD200647449 /* InputTextField.m in Sources */,
 				BCC9F42C27F69BD200647449 /* InputTextField.m in Sources */,
 				2779320727E30FC30010E277 /* KSRecordStatusView.m in Sources */,
 				2779320727E30FC30010E277 /* KSRecordStatusView.m in Sources */,
+				BC3ACD9F2891261800060E97 /* MyMusicNavView.m in Sources */,
 				2779329527E30FEB0010E277 /* MSSBrowseBaseViewController.m in Sources */,
 				2779329527E30FEB0010E277 /* MSSBrowseBaseViewController.m in Sources */,
 				BC41103828066C2F00800BD9 /* HomeworkListViewController.m in Sources */,
 				BC41103828066C2F00800BD9 /* HomeworkListViewController.m in Sources */,
 				BCC9F42327F69BD200647449 /* MainContainerView.m in Sources */,
 				BCC9F42327F69BD200647449 /* MainContainerView.m in Sources */,

二进制
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 7 - 23
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -314,8 +314,8 @@
             filePath = "KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.m"
             filePath = "KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.m"
             startingColumnNumber = "9223372036854775807"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "87"
-            endingLineNumber = "87"
+            startingLineNumber = "94"
+            endingLineNumber = "94"
             landmarkName = "-hideView"
             landmarkName = "-hideView"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
@@ -330,8 +330,8 @@
             filePath = "KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.m"
             filePath = "KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.m"
             startingColumnNumber = "9223372036854775807"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "104"
-            endingLineNumber = "104"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
             landmarkName = "-gestureRecognizer:shouldReceiveTouch:"
             landmarkName = "-gestureRecognizer:shouldReceiveTouch:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
@@ -1026,22 +1026,6 @@
       <BreakpointProxy
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
          <BreakpointContent
-            uuid = "E327D65C-B4E3-47F6-AD66-979B5D08CC11"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "115"
-            endingLineNumber = "115"
-            landmarkName = "-requestData"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "E24848CD-B197-43F2-AB07-87FA21999D23"
             uuid = "E24848CD-B197-43F2-AB07-87FA21999D23"
             shouldBeEnabled = "No"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             ignoreCount = "0"
@@ -1065,9 +1049,9 @@
             filePath = "KulexiuForTeacher/Common/Base/KSNetworkingManager.m"
             filePath = "KulexiuForTeacher/Common/Base/KSNetworkingManager.m"
             startingColumnNumber = "9223372036854775807"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1741"
-            endingLineNumber = "1741"
-            landmarkName = "+userAccountPageRequest:searchDate:bizType:postStatus:page:rows:success:faliure:"
+            startingLineNumber = "1742"
+            endingLineNumber = "1742"
+            landmarkName = "+userAccountPageRequest:paymentStatus:searchDate:bizType:postStatus:page:rows:success:faliure:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h

@@ -550,14 +550,14 @@ NS_ASSUME_NONNULL_BEGIN
 // /api-teacher/music/sheet/my
 // /api-teacher/music/sheet/my
 
 
 /// 我订阅的曲谱
 /// 我订阅的曲谱
-/// @param get get
+/// @param post post
 /// @param page 分页
 /// @param page 分页
 /// @param rows 条数
 /// @param rows 条数
 /// @param search 搜索
 /// @param search 搜索
 /// @param subjectIds 声部
 /// @param subjectIds 声部
 /// @param success 成功
 /// @param success 成功
 /// @param faliure 失败
 /// @param faliure 失败
-+ (void)myMusicListRequest:(NSString *)get page:(NSInteger)page rows:(NSInteger)rows search:(NSString *)search subjectIds:(NSString *)subjectIds success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)myMusicListRequest:(NSString *)post page:(NSInteger)page rows:(NSInteger)rows search:(NSString *)search subjectIds:(NSString *)subjectIds success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 
 
 
 // /api-teacher/music/sheet/list
 // /api-teacher/music/sheet/list

+ 4 - 3
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -1152,21 +1152,22 @@
 // /api-teacher/music/sheet/my
 // /api-teacher/music/sheet/my
 
 
 /// 我订阅的曲谱
 /// 我订阅的曲谱
-/// @param get get
+/// @param post post
 /// @param page 分页
 /// @param page 分页
 /// @param rows 条数
 /// @param rows 条数
 /// @param search 搜索
 /// @param search 搜索
 /// @param subjectIds 声部
 /// @param subjectIds 声部
 /// @param success 成功
 /// @param success 成功
 /// @param faliure 失败
 /// @param faliure 失败
-+ (void)myMusicListRequest:(NSString *)get page:(NSInteger)page rows:(NSInteger)rows search:(NSString *)search subjectIds:(NSString *)subjectIds success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)myMusicListRequest:(NSString *)post page:(NSInteger)page rows:(NSInteger)rows search:(NSString *)search subjectIds:(NSString *)subjectIds success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestMethodJSON];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/music/sheet/my"];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/music/sheet/my"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [parm setValue:@(rows) forKey:@"rows"];
     [parm setValue:search forKey:@"idAndName"];
     [parm setValue:search forKey:@"idAndName"];
     [parm setValue:subjectIds forKey:@"subjectIds"];
     [parm setValue:subjectIds forKey:@"subjectIds"];
-    [self request:get andWithUrl:url and:parm success:success faliure:faliure];
+    [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
 }
 
 
 // /api-teacher/music/sheet/list
 // /api-teacher/music/sheet/list

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Tools/GifRefresh/KSGifRefreshFooter.m

@@ -20,7 +20,6 @@
 
 
 - (instancetype)init {
 - (instancetype)init {
     if (self = [super init]) {
     if (self = [super init]) {
-//        self.stateLabel.hidden = YES;
         [self setJsonName:@"teacher_refresh.json"];
         [self setJsonName:@"teacher_refresh.json"];
     }
     }
     return self;
     return self;

+ 35 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Controller/MyMusicViewController.m

@@ -22,11 +22,15 @@
 #import "MyMusicSearchView.h"
 #import "MyMusicSearchView.h"
 #import "KSChoosePicker.h"
 #import "KSChoosePicker.h"
 
 
+#import "MyMusicNavView.h"
+
 #define HEADER_HEIGHT (50)
 #define HEADER_HEIGHT (50)
 #define SEARCH_HEIGHT (50)
 #define SEARCH_HEIGHT (50)
 
 
 @interface MyMusicViewController ()<JXPagerViewDelegate, JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate>
 @interface MyMusicViewController ()<JXPagerViewDelegate, JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate>
 
 
+@property (nonatomic, strong) MyMusicNavView *navView;
+
 @property (nonatomic, assign) NSInteger selectedIndex;
 @property (nonatomic, assign) NSInteger selectedIndex;
 
 
 @property (nonatomic, strong) NSMutableArray *listViewArray;
 @property (nonatomic, strong) NSMutableArray *listViewArray;
@@ -51,20 +55,28 @@
 - (void)viewDidLoad {
 - (void)viewDidLoad {
     [super viewDidLoad];
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     // Do any additional setup after loading the view.
-    [self allocTitle:@"我的曲谱"];
+    self.ks_prefersNavigationBarHidden = YES;
     _titles = @[@"已购买",@"已上架",@"审核中",@"审核失败"];
     _titles = @[@"已购买",@"已上架",@"审核中",@"审核失败"];
     [self configUI];
     [self configUI];
 }
 }
 
 
 - (void)configUI {
 - (void)configUI {
-    [self rightButton:[UIImage imageNamed:@"nav_share_image"]];
     [self.scrollView removeFromSuperview];
     [self.scrollView removeFromSuperview];
     self.view.backgroundColor = HexRGB(0xf6f8f9);
     self.view.backgroundColor = HexRGB(0xf6f8f9);
+    [self.view addSubview:self.navView];
+    [self.navView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.mas_equalTo(self.view);
+        make.height.mas_equalTo(kNaviBarHeight);
+    }];
     
     
     [self.view addSubview:self.searchView];
     [self.view addSubview:self.searchView];
-    self.searchView.frame = CGRectMake(0, 0, KPortraitWidth, SEARCH_HEIGHT);
+    [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.view);
+        make.top.mas_equalTo(self.navView.mas_bottom);
+        make.height.mas_equalTo(SEARCH_HEIGHT);
+    }];
     
     
-    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, SEARCH_HEIGHT, kScreenWidth, HEADER_HEIGHT)];
+    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, SEARCH_HEIGHT + kNaviBarHeight, kScreenWidth, HEADER_HEIGHT)];
     self.categoryView.titles = self.titles;
     self.categoryView.titles = self.titles;
     self.categoryView.delegate = self;
     self.categoryView.delegate = self;
     self.categoryView.titleFont = [UIFont systemFontOfSize:17.0f];
     self.categoryView.titleFont = [UIFont systemFontOfSize:17.0f];
@@ -80,7 +92,7 @@
     self.categoryView.indicators = @[lineView];
     self.categoryView.indicators = @[lineView];
     
     
     _pagerView = [self preferredPagingView];
     _pagerView = [self preferredPagingView];
-    self.pagerView.frame = CGRectMake(0, SEARCH_HEIGHT, kScreenWidth, kScreenHeight - kNaviBarHeight - iPhoneXSafeBottomMargin - SEARCH_HEIGHT);
+    self.pagerView.frame = CGRectMake(0, SEARCH_HEIGHT + kNaviBarHeight, KPortraitWidth, KPortraitHeight - kNaviBarHeight - iPhoneXSafeBottomMargin - SEARCH_HEIGHT);
     self.pagerView.backgroundColor = [UIColor clearColor];
     self.pagerView.backgroundColor = [UIColor clearColor];
     self.pagerView.mainTableView.backgroundColor = [UIColor clearColor];
     self.pagerView.mainTableView.backgroundColor = [UIColor clearColor];
     self.pagerView.listContainerView.backgroundColor = [UIColor clearColor];
     self.pagerView.listContainerView.backgroundColor = [UIColor clearColor];
@@ -91,7 +103,7 @@
     self.categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerView.listContainerView;
     self.categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerView.listContainerView;
 }
 }
 
 
-- (void)rightBtnClick { // 获取分享数据
+- (void)shareButtonClick { // 获取分享数据
     [self showhud];
     [self showhud];
     [KSNetworkingManager queryMusicShareMessageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
     [KSNetworkingManager queryMusicShareMessageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
         [self removehub];
         [self removehub];
@@ -126,7 +138,7 @@
             [weakSelf showShareUI:image];
             [weakSelf showShareUI:image];
         }
         }
     }];
     }];
-    [self.shareView showShareView];
+    [self.shareView showShareViewInView:self.view];
     
     
 }
 }
 
 
@@ -399,6 +411,22 @@
     }
     }
 }
 }
 
 
+- (MyMusicNavView *)navView {
+    if (!_navView) {
+        _navView = [MyMusicNavView shareInstance];
+        MJWeakSelf;
+        [_navView musicNavAction:^(MUSICNAVACTION action) {
+            if (action == MUSICNAVACTION_BACK) {
+                [weakSelf backAction];
+            }
+            else {
+                [weakSelf shareButtonClick];
+            }
+        }];
+    }
+    return _navView;
+}
+
 /*
 /*
 #pragma mark - Navigation
 #pragma mark - Navigation
 
 

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.h

@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 - (void)showShareView;
 - (void)showShareView;
 
 
+- (void)showShareViewInView:(UIView *)displayView;
+
 - (void)shareActionCallback:(ShareCallback)callback;
 - (void)shareActionCallback:(ShareCallback)callback;
 
 
 - (void)hideView;
 - (void)hideView;

+ 7 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.m

@@ -83,6 +83,13 @@
     [[NSObject getKeyWindow] addSubview:self];
     [[NSObject getKeyWindow] addSubview:self];
 }
 }
 
 
+- (void)showShareViewInView:(UIView *)displayView {
+    if (!displayView) {
+        return;
+    }
+    [displayView addSubview:self];
+}
+
 - (void)hideView {
 - (void)hideView {
     [self removeFromSuperview];
     [self removeFromSuperview];
 }
 }

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m

@@ -110,7 +110,7 @@
 
 
 - (void)requestData {
 - (void)requestData {
     if (self.selectIndex == 0) {
     if (self.selectIndex == 0) {
-        [KSNetworkingManager myMusicListRequest:KS_GET page:self.pages rows:self.rows search:self.searchKey subjectIds:self.subjectIds success:^(NSDictionary * _Nonnull dic) {
+        [KSNetworkingManager myMusicListRequest:KS_POST page:self.pages rows:self.rows search:self.searchKey subjectIds:self.subjectIds success:^(NSDictionary * _Nonnull dic) {
             [self endRefresh];
             [self endRefresh];
             if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
                 NSArray *sourceArray = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"rows"];
                 NSArray *sourceArray = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"rows"];

+ 27 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicNavView.h

@@ -0,0 +1,27 @@
+//
+//  MyMusicNavView.h
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2022/7/27.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, MUSICNAVACTION) {
+    MUSICNAVACTION_BACK,  // 返回
+    MUSICNAVACTION_SHARE, // 分享
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void(^MusicNavCallback)(MUSICNAVACTION action);
+
+@interface MyMusicNavView : UIView
+
++ (instancetype)shareInstance;
+
+- (void)musicNavAction:(MusicNavCallback)callback;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 49 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicNavView.m

@@ -0,0 +1,49 @@
+//
+//  MyMusicNavView.m
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2022/7/27.
+//
+
+#import "MyMusicNavView.h"
+
+@interface MyMusicNavView ()
+
+@property (nonatomic, copy) MusicNavCallback callback;
+
+@end
+
+@implementation MyMusicNavView
+
++ (instancetype)shareInstance {
+    MyMusicNavView *view = [[[NSBundle mainBundle] loadNibNamed:@"MyMusicNavView" owner:nil options:nil] firstObject];
+    return view;
+}
+
+- (void)musicNavAction:(MusicNavCallback)callback {
+    if (callback) {
+        self.callback = callback;
+    }
+}
+
+- (IBAction)backAction:(id)sender {
+    if (self.callback) {
+        self.callback(MUSICNAVACTION_BACK);
+    }
+}
+
+- (IBAction)shareAction:(id)sender {
+    if (self.callback) {
+        self.callback(MUSICNAVACTION_SHARE);
+    }
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

+ 82 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicNavView.xib

@@ -0,0 +1,82 @@
+<?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="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="MyMusicNavView">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="103"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Un-oK-0CF">
+                    <rect key="frame" x="0.0" y="59" width="414" height="44"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_black" translatesAutoresizingMaskIntoConstraints="NO" id="9ae-KK-7Y1">
+                            <rect key="frame" x="15" y="12" width="12" height="20"/>
+                        </imageView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aCc-yu-0gK">
+                            <rect key="frame" x="0.0" y="2" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="4Eh-gC-rUS"/>
+                                <constraint firstAttribute="width" constant="40" id="nqK-ex-K0w"/>
+                            </constraints>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <connections>
+                                <action selector="backAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="5xw-e4-KyU"/>
+                            </connections>
+                        </button>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的曲谱" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fg5-gJ-agg">
+                            <rect key="frame" x="170" y="11" width="74" height="22"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
+                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aTN-Vw-gUO">
+                            <rect key="frame" x="364" y="2" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="40" id="W3a-4F-g3b"/>
+                                <constraint firstAttribute="height" constant="40" id="vAw-cw-Ult"/>
+                            </constraints>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" image="nav_share_image"/>
+                            <connections>
+                                <action selector="shareAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="jpt-Fr-rTj"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="aCc-yu-0gK" firstAttribute="leading" secondItem="0Un-oK-0CF" secondAttribute="leading" id="0DE-zh-R5F"/>
+                        <constraint firstAttribute="trailing" secondItem="aTN-Vw-gUO" secondAttribute="trailing" constant="10" id="70B-T7-F7h"/>
+                        <constraint firstItem="fg5-gJ-agg" firstAttribute="centerY" secondItem="0Un-oK-0CF" secondAttribute="centerY" id="9zD-S2-MlJ"/>
+                        <constraint firstItem="aCc-yu-0gK" firstAttribute="centerY" secondItem="9ae-KK-7Y1" secondAttribute="centerY" id="SuD-5q-A4e"/>
+                        <constraint firstAttribute="height" constant="44" id="WBm-Jc-6cl"/>
+                        <constraint firstItem="aTN-Vw-gUO" firstAttribute="centerY" secondItem="0Un-oK-0CF" secondAttribute="centerY" id="iZo-yv-Yyx"/>
+                        <constraint firstItem="fg5-gJ-agg" firstAttribute="centerX" secondItem="0Un-oK-0CF" secondAttribute="centerX" id="pbU-58-Rhv"/>
+                        <constraint firstItem="9ae-KK-7Y1" firstAttribute="leading" secondItem="0Un-oK-0CF" secondAttribute="leading" constant="15" id="tm2-97-ANH"/>
+                        <constraint firstItem="aCc-yu-0gK" firstAttribute="centerY" secondItem="0Un-oK-0CF" secondAttribute="centerY" id="yzG-NG-YSo"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.96470588235294119" green="0.97254901960784312" blue="0.97647058823529409" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="0Un-oK-0CF" secondAttribute="bottom" id="cn7-fn-TzD"/>
+                <constraint firstItem="0Un-oK-0CF" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="dct-AI-fyK"/>
+                <constraint firstAttribute="trailing" secondItem="0Un-oK-0CF" secondAttribute="trailing" id="sZH-gf-ekT"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="131.8840579710145" y="-42.522321428571423"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="back_black" width="12" height="20"/>
+        <image name="nav_share_image" width="19" height="19"/>
+    </resources>
+</document>

+ 23 - 22
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBodyView.m

@@ -73,6 +73,29 @@
 }
 }
 
 
 - (void)configMessage:(TeacherInfo *)infoMessage {
 - (void)configMessage:(TeacherInfo *)infoMessage {
+    
+    NSArray *tagArray = [infoMessage.tag componentsSeparatedByString:@","];
+    NSString *viperImage = infoMessage.isVip ? @"mine_vip" : @"mine_nomal";
+    [self.viperImage setImage:[UIImage imageNamed:viperImage]];
+    [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_nomal"]];
+    [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_nomal"]];
+    [self.liveImage setImage:[UIImage imageNamed:@"mineLive_nomal"]];
+    [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_nomal"]];
+    for (NSString *tagString in tagArray) {
+        if ([tagString isEqualToString:@"STYLE"]) {
+            [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_active"]];
+        }
+        else if ([tagString isEqualToString:@"VIDEO"]) {
+            [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_active"]];
+        }
+        else if ([tagString isEqualToString:@"LIVE"]) {
+            [self.liveImage setImage:[UIImage imageNamed:@"mineLive_active"]];
+        }
+        else if ([tagString isEqualToString:@"MUSIC"]) {
+            [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_active"]];
+        }
+    }
+    
     if ([infoMessage.entryStatus isEqualToString:@"PASS"]) {
     if ([infoMessage.entryStatus isEqualToString:@"PASS"]) {
         self.hasAuthTeacher = YES;
         self.hasAuthTeacher = YES;
         self.descView.hidden = NO;
         self.descView.hidden = NO;
@@ -80,28 +103,6 @@
         [self displayCount:infoMessage.fansNum inView:self.fansCount descTitle:@"粉丝  "];
         [self displayCount:infoMessage.fansNum inView:self.fansCount descTitle:@"粉丝  "];
         [self displayCount:infoMessage.expTime inView:self.finishCourse descTitle:@"已上课时  "];
         [self displayCount:infoMessage.expTime inView:self.finishCourse descTitle:@"已上课时  "];
         [self displayCount:infoMessage.unExpTime inView:self.unfinishCourse descTitle:@"未上课时  "];
         [self displayCount:infoMessage.unExpTime inView:self.unfinishCourse descTitle:@"未上课时  "];
-        
-        NSArray *tagArray = [infoMessage.tag componentsSeparatedByString:@","];
-        NSString *viperImage = infoMessage.isVip ? @"mine_vip" : @"mine_nomal";
-        [self.viperImage setImage:[UIImage imageNamed:viperImage]];
-        [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_nomal"]];
-        [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_nomal"]];
-        [self.liveImage setImage:[UIImage imageNamed:@"mineLive_nomal"]];
-        [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_nomal"]];
-        for (NSString *tagString in tagArray) {
-            if ([tagString isEqualToString:@"STYLE"]) {
-                [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_active"]];
-            }
-            else if ([tagString isEqualToString:@"VIDEO"]) {
-                [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_active"]];
-            }
-            else if ([tagString isEqualToString:@"LIVE"]) {
-                [self.liveImage setImage:[UIImage imageNamed:@"mineLive_active"]];
-            }
-            else if ([tagString isEqualToString:@"MUSIC"]) {
-                [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_active"]];
-            }
-        }
     }
     }
     else {
     else {
         self.hasAuthTeacher = NO;
         self.hasAuthTeacher = NO;