Browse Source

下架曲谱弹窗

Steven 2 years ago
parent
commit
a68a2b3a0a

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -7970,7 +7970,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -8032,7 +8032,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

BIN
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 185
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -64,196 +64,13 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1632"
             endingLineNumber = "1632"
-            landmarkName = "-pauseLiveActionBack:"
+            landmarkName = "-quitRoomBackPreView:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "643"
-            endingLineNumber = "643"
-            landmarkName = "-configIMConnect"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d204ca35ec8ae2b6"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[LiveRoomViewController IMConnetedCallback]"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - 3a084d2c1ad9f33a"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "32">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a555397ad49"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_2"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "40">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a555397ad49"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_2"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "112">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a54d397ad56"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_3"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - 3d9a4aa3c53a99b5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke.496"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "60">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - f2c662b6142070c0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_2.500"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "32">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - f2c662a13fea5cde"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_3.501"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "40">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - f2c662a13fea5cde"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_3.501"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "112">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a545397ad57"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_4"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "5C80B9CF-A044-4C8C-8C07-1D73C8DB506D - d3d03a57d397ad54"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[LiveRoomViewController IMConnetedCallback]_block_invoke_5"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "635"
-                  endingLineNumber = "635"
-                  offsetFromSymbolStart = "60">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "EA9FEA48-4616-4094-BBE4-66F574A0FB75"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
@@ -263,7 +80,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "510"
             endingLineNumber = "510"
-            landmarkName = "-appBecomeActive"
+            landmarkName = "-setupUI"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

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

@@ -12,6 +12,7 @@
 #import "KSBaseWKWebViewController.h"
 #import "AuthDisplayView.h"
 #import "KSAccompanyWebViewController.h"
+#import "KSPublicAlertView.h"
 
 @interface MyMusicBodyView ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -34,6 +35,8 @@
 
 @property (nonatomic, strong) AuthDisplayView *authView;
 
+@property (nonatomic, strong) KSPublicAlertView *alertView;
+
 @end
 
 @implementation MyMusicBodyView
@@ -234,11 +237,20 @@
     BOOL needOffButton = self.selectIndex == 1 ? YES : NO;
     MJWeakSelf;
     [cell configWithMessage:model needOffButton:needOffButton callback:^(MusicMessageModel * _Nonnull songMessage) {
-        [weakSelf musicOffAction:songMessage];
+        [weakSelf showAlert:songMessage];
     }];
     return cell;
 }
 
+- (void)showAlert:(MusicMessageModel *)songMessage {
+    MJWeakSelf;
+    self.alertView = [KSPublicAlertView shareInstanceWithTitle:@"提示" descMessage:@"确认下架曲谱" leftTitle:@"取消" rightTitle:@"确定" cancelAction:^{
+        
+    } sureAction:^{
+        [weakSelf musicOffAction:songMessage];
+    }];
+}
+
 - (void)musicOffAction:(MusicMessageModel *)songMessage {
     [KSNetworkingManager musicOffRequest:KS_POST musicId:[NSString stringWithFormat:@"%.0f",songMessage.internalBaseClassIdentifier] success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m

@@ -214,7 +214,7 @@
     VideoCourseCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"VideoCourseCell" forIndexPath:indexPath];
     
     VideoCourseModel *model = [self.dataArray objectAtIndex:indexPath.row];
-    BOOL isCheck = self.selectIndex != 0;
+    BOOL isCheck = NO;
     [cell configSourceModel:model isInCheck:isCheck];
     return cell;
 }

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.m

@@ -59,7 +59,6 @@
         self.descView.hidden = NO;
         if (model.lessonPrice > 0) {
             self.descLabel.text = [NSString stringWithFormat:@"%.0f人已购买",model.countStudent];
-
         }
         else {
             self.descLabel.text = [NSString stringWithFormat:@"%.0f人已领取",model.countStudent];