Kaynağa Gözat

公众号名字

Steven 5 yıl önce
ebeveyn
işleme
e91416eeff

+ 7 - 0
MusicGradeExam/MusicGradeExam/UI/Classroom/View/VideoList/ClassVideoListView.m

@@ -16,6 +16,8 @@
 @property (nonatomic, strong) UITableView *videoListTableView;
 @property (nonatomic, strong) NSMutableArray *videoDataSource;
 @property (nonatomic, strong) dispatch_queue_t videoListQueue;
+@property (nonatomic, strong) dispatch_semaphore_t signalSemaphore;
+
 @end
 
 
@@ -28,6 +30,7 @@
     if (self) {
         self.backgroundColor = [UIColor clearColor];
         [self addSubview:self.videoListTableView];
+        _signalSemaphore = dispatch_semaphore_create(1);
         [self getDataSource];
     }
     return self;
@@ -36,6 +39,7 @@
 - (void)getDataSource {
     // 自己第一,讲师第二
     dispatch_async(self.videoListQueue, ^{
+        MJ_LOCK(self.signalSemaphore)
         NSArray *tempArray = [ClassroomService sharedService].currentRoom.memberList;
         if (tempArray.count <= 0) {
             return;
@@ -68,12 +72,14 @@
         dispatch_async(dispatch_get_main_queue(), ^{
             self.videoDataSource = [lastArray mutableCopy];
             [self.videoListTableView reloadData];
+            MJ_UNLOCK(self.signalSemaphore)
         });
     });
 }
 
 - (void)updateUserVideo:(NSString *)userId {
     dispatch_async(self.videoListQueue, ^{
+        MJ_LOCK(self.signalSemaphore)
         for(int i=0;i<self.videoDataSource.count;i++) {
             RoomMember *member = self.videoDataSource[i];
             if([member.userId isEqualToString:userId]) {
@@ -86,6 +92,7 @@
                 });
             }
         }
+        MJ_UNLOCK(self.signalSemaphore)
     });
 }
 

+ 1 - 1
MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Controller/ExamLibraryController.m

@@ -199,7 +199,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     SongListModel *model = self.dataArray[indexPath.row];
     if ([NSString isEmptyString:model.fileUrlList]) {
-        [self MBPShow:@"曲库链接错误"];
+        [self MBPShow:@"暂无曲谱文件"];
         return;
     }
     OpenFileViewController *readCtrl = [[OpenFileViewController alloc] init];

+ 1 - 1
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.m

@@ -31,7 +31,7 @@
     self.contactField.delegate = self;
     self.contactField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"  您的邮箱或手机号" attributes:@{NSForegroundColorAttributeName:HexRGB(0x777777), NSFontAttributeName:[UIFont systemFontOfSize:14.0f weight:UIFontWeightMedium]}];
     
-    _wxContact.text = @"微信公众号:酷乐秀App";
+    _wxContact.text = @"微信公众号:酷乐秀";
     _emailContact.text = @"邮箱:kulexiu@whjmylwlkjwwgc.onexmail.com";
     
     [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];

+ 2 - 2
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.xib

@@ -58,8 +58,8 @@
                     <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微信公众号:酷乐秀App" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RQx-jz-yxS">
-                    <rect key="frame" x="16" y="356" width="155.5" 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="RQx-jz-yxS">
+                    <rect key="frame" x="16" y="356" width="129" height="17"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                     <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>