nothing

MusicGradeExam/MusicGradeExam/Base/KSBaseWKWebViewController.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) BOOL modifyUserAgent;
 
-- (void)payWithMessage:(NSDictionary *)dic;
+- (void)configWithMessage:(NSDictionary *)dic;
 
 - (void)configLocalStorage;
 

MusicGradeExam/MusicGradeExam/Base/KSBaseWKWebViewController.m

@@ -354,7 +354,7 @@
     // Pass the selected object to the new view controller.
 }
 */
-- (void)payWithMessage:(NSDictionary *)dic {
+- (void)configWithMessage:(NSDictionary *)dic {
     if (dic) {
         self.postJsDict = dic;
     }

MusicGradeExam/MusicGradeExam/KSRequestManager.m

@@ -131,7 +131,7 @@
         [self showMessage:@"登录过期，请重新登录"];
     }
     else {
-        [self showMessage:@"未认证"];
+        [self showMessage:@"认证失败，请重新登录"];
     }
     [self logoutAction];
 }

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/ClassroomService.m

@@ -718,6 +718,9 @@
             if ([self.classroomDelegate respondsToSelector:@selector(memberRecordAction:)]) {
                 [self.classroomDelegate memberRecordAction:mem];
             }
+            else {
+               [[NSNotificationCenter defaultCenter] postNotificationName:RefreshWaitListNotification object:nil];
+            }
         }
         else if (msg.action == MemberChangeActionRefresh) { // 刷新列表
             
@@ -732,7 +735,6 @@
         }
         else if (msg.action == MemberChangeActionNoFinish) { // 未完成考试重新去排队
             RoomMember *mem = [self.currentRoom getMember:msg.userId];
-
             if ([self.classroomDelegate respondsToSelector:@selector(memberNoFinishAction:)]) {
                 [self.classroomDelegate memberNoFinishAction:mem];
             }

MusicGradeExam/MusicGradeExam/UI/Exam/Controller/WaitExamViewController.m

@@ -46,9 +46,11 @@
 
 // 去录播
 - (void)toRecordExam {
-    RecordExamViewController *ctrl = [[RecordExamViewController alloc] init];
-    ctrl.examRegistrationId = self.examRegistrationId;
-    [self.navigationController pushViewController:ctrl animated:YES];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        RecordExamViewController *ctrl = [[RecordExamViewController alloc] init];
+        ctrl.examRegistrationId = self.examRegistrationId;
+        [self.navigationController pushViewController:ctrl animated:YES];
+    });
 }
 
 

MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.xib

@@ -133,7 +133,7 @@
                                         <constraint firstAttribute="bottom" secondItem="A1y-sO-QGA" secondAttribute="bottom" constant="5" id="nHp-pD-2sp"/>
                                     </constraints>
                                 </view>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2020年中央音乐学院考级" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FUD-mv-Z7W">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FUD-mv-Z7W">
                                     <rect key="frame" x="10" y="23" width="340" height="28"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="28" id="Slf-ww-Bdz"/>

MusicGradeExam/MusicGradeExam/UI/RecordExam/Controller/RecordExamViewController.m

@@ -16,6 +16,7 @@
 #import "WMPlayer.h"
 #import "SongModel.h"
 #import "KSGuideMaskView.h"
+#import "KSNormalAlertView.h"
 
 @interface RecordExamViewController ()<UITableViewDelegate, UITableViewDataSource,WMPlayerDelegate>
 {
@@ -300,7 +301,19 @@
 }
 
 - (void)submitAction {
-    // 提交 完成考试
+    
+    // 是否确认提交
+    MJWeakSelf;
+    [KSNormalAlertView ks_showAlertWithTitle:@"确认已提交所有曲目？\n提交之后无法修改" leftTitle:@"取消" rightTitle:@"确定" cancel:^{
+        
+    } confirm:^{
+        [weakSelf submitService];
+    }];
+    
+}
+
+// // 提交 完成考试
+- (void)submitService {
     [self showhud];
     NSString *videoUrl = [self.fileUrlArray componentsJoinedByString:@","];
     [KSRequestManager stuEndRecordFinishRequest:KS_POST examRegistrationId:self.examRegistrationId videoUrl:videoUrl success:^(NSDictionary * _Nonnull dic) {

MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/AboutBodyView.m

@@ -23,8 +23,8 @@
     [super awakeFromNib];
     self.versonLabel.text = [NSString stringWithFormat:@"版本号%@",[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]];
     
-    _phoneLabel.text = @"027-87718176";
-    _emailLabel.text = @"super_orchestra@163.com";
+    _phoneLabel.text = @"027-87718177";
+    _emailLabel.text = @"kulexiu@whjmylwlkjwwgc.onexmail.com";
     
 }
 

MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/AboutBodyView.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -40,8 +40,8 @@
                             <color key="textColor" red="0.26666666666666666" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="027-87718176" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMX-3Q-nIu">
-                            <rect key="frame" x="289" y="15" width="109" height="20"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="027-87718177" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMX-3Q-nIu">
+                            <rect key="frame" x="290" y="15" width="108" height="20"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                             <color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -70,13 +70,16 @@
                     <rect key="frame" x="0.0" y="215" width="414" height="50"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E-MAIL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kfb-Ud-UYp">
-                            <rect key="frame" x="16" y="15" width="55" height="20"/>
+                            <rect key="frame" x="16" y="15" width="60" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="60" id="gbz-Xc-2lz"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                             <color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="dyme2002@dayaedu.com" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x31-ch-1Va">
-                            <rect key="frame" x="203" y="15" width="195" height="20"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="kulexiu@whjmylwlkjwwgc.onexmail.com" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x31-ch-1Va">
+                            <rect key="frame" x="91" y="15.5" width="307" height="19.5"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                             <color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -95,6 +98,7 @@
                         <constraint firstAttribute="trailing" secondItem="3uU-Qr-qvD" secondAttribute="trailing" id="BcM-kM-dEp"/>
                         <constraint firstItem="3uU-Qr-qvD" firstAttribute="leading" secondItem="YJ1-PU-6TT" secondAttribute="leading" id="Kd2-Qd-VKp"/>
                         <constraint firstItem="x31-ch-1Va" firstAttribute="centerY" secondItem="YJ1-PU-6TT" secondAttribute="centerY" id="Zxc-tr-LYe"/>
+                        <constraint firstItem="x31-ch-1Va" firstAttribute="leading" secondItem="kfb-Ud-UYp" secondAttribute="trailing" constant="15" id="ab1-aN-DpK"/>
                         <constraint firstAttribute="bottom" secondItem="3uU-Qr-qvD" secondAttribute="bottom" id="f9C-NW-7Vq"/>
                         <constraint firstAttribute="trailing" secondItem="x31-ch-1Va" secondAttribute="trailing" constant="16" id="fiR-k5-dLC"/>
                         <constraint firstItem="kfb-Ud-UYp" firstAttribute="centerY" secondItem="YJ1-PU-6TT" secondAttribute="centerY" id="xoW-Rc-Ob0"/>
@@ -124,6 +128,6 @@
         </view>
     </objects>
     <resources>
-        <image name="aboutUs" width="149" height="50"/>
+        <image name="aboutUs" width="170" height="48"/>
     </resources>
 </document>

MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.m

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

MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.xib

@@ -64,8 +64,8 @@
                     <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="邮箱：super_orchestra@163.com" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lsw-Mu-XKa">
-                    <rect key="frame" x="16" y="378" width="218.5" height="17"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="邮箱：kulexiu@whjmylwlkjwwgc.onexmail.com" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lsw-Mu-XKa">
+                    <rect key="frame" x="16" y="378" width="308" 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"/>
@@ -152,6 +152,6 @@
         </view>
     </objects>
     <resources>
-        <image name="button_nomal" width="340" height="49"/>
+        <image name="button_nomal" width="49.5" height="49"/>
     </resources>
 </document>