Steven před 4 roky
rodič
revize
b4fdbc112b

+ 7 - 0
MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -96,6 +96,13 @@
 //#define WEBHOST (@"https://test.m.kj.colexiu.com")
 //#define JSPUSH_ENVIRONMENT (NO)
 //#define RCIM_KEY (@"mgb7ka1nme0yg")
+
+//#define hostURL (@"http://195s22s709.imwork.net")
+//#define SEALCLASSHOST (@"http://195s22s709.imwork.net/api-im")
+//#define WEBHOST (@"https://test.m.kj.colexiu.com")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"mgb7ka1nme0yg")
+
 //#else    // 线上
 
 //#define hostURL (@"https://kj.colexiu.com")

+ 9 - 9
MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.xib

@@ -54,7 +54,7 @@
                             <rect key="frame" x="11" y="11" width="360" height="390"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="准考证号:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KFg-DG-VJj">
-                                    <rect key="frame" x="20" y="135" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="135" width="324" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="4jJ-Hb-l6c"/>
                                     </constraints>
@@ -63,7 +63,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考生名字:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hj2-Sz-yoI">
-                                    <rect key="frame" x="20" y="163" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="163" width="208" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="Qse-p4-2qW"/>
                                     </constraints>
@@ -72,7 +72,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考生性别:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="59a-SL-h8z">
-                                    <rect key="frame" x="20" y="191" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="191" width="324" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="fLE-r4-pJ8"/>
                                     </constraints>
@@ -81,7 +81,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="报考专业:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yik-4s-H4Q">
-                                    <rect key="frame" x="20" y="219" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="219" width="324" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="goO-9e-RAZ"/>
                                     </constraints>
@@ -90,7 +90,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="报考级别:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="baH-bx-beF">
-                                    <rect key="frame" x="20" y="247" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="247" width="324" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="bVh-7M-K79"/>
                                     </constraints>
@@ -99,7 +99,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考试时间:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pgz-3o-9OJ">
-                                    <rect key="frame" x="20" y="275" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="275" width="324" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="55S-oJ-IwL"/>
                                     </constraints>
@@ -108,7 +108,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考试地点:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sl8-xL-Pp2">
-                                    <rect key="frame" x="20" y="303" width="213" height="20"/>
+                                    <rect key="frame" x="20" y="303" width="324" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="1fz-eA-rgH"/>
                                     </constraints>
@@ -167,19 +167,19 @@
                                 <constraint firstItem="baH-bx-beF" firstAttribute="trailing" secondItem="KFg-DG-VJj" secondAttribute="trailing" id="EqX-RZ-Xjr"/>
                                 <constraint firstItem="Yik-4s-H4Q" firstAttribute="trailing" secondItem="KFg-DG-VJj" secondAttribute="trailing" id="HAg-jY-J0q"/>
                                 <constraint firstItem="pgz-3o-9OJ" firstAttribute="top" secondItem="baH-bx-beF" secondAttribute="bottom" constant="8" id="Hr2-4f-Q9I"/>
-                                <constraint firstItem="hj2-Sz-yoI" firstAttribute="trailing" secondItem="KFg-DG-VJj" secondAttribute="trailing" id="ImE-en-N7I"/>
                                 <constraint firstItem="Q6o-Wj-idS" firstAttribute="centerX" secondItem="Cj7-w9-VFo" secondAttribute="centerX" id="J59-HO-db6"/>
                                 <constraint firstItem="59a-SL-h8z" firstAttribute="trailing" secondItem="KFg-DG-VJj" secondAttribute="trailing" id="L5b-mH-b6z"/>
                                 <constraint firstItem="KFg-DG-VJj" firstAttribute="leading" secondItem="Cj7-w9-VFo" secondAttribute="leading" constant="20" id="MzQ-PY-csB"/>
                                 <constraint firstItem="baH-bx-beF" firstAttribute="top" secondItem="Yik-4s-H4Q" secondAttribute="bottom" constant="8" id="N4O-io-7xo"/>
                                 <constraint firstAttribute="trailing" secondItem="Dfb-jr-3dr" secondAttribute="trailing" constant="20" id="N4x-PH-nlO"/>
+                                <constraint firstItem="Dfb-jr-3dr" firstAttribute="leading" secondItem="hj2-Sz-yoI" secondAttribute="trailing" constant="10" id="OaD-wd-Fyo"/>
                                 <constraint firstItem="pgz-3o-9OJ" firstAttribute="leading" secondItem="KFg-DG-VJj" secondAttribute="leading" id="U0A-6l-VQq"/>
                                 <constraint firstItem="Dfb-jr-3dr" firstAttribute="top" secondItem="KFg-DG-VJj" secondAttribute="bottom" constant="5" id="Vus-fg-bsv"/>
+                                <constraint firstAttribute="trailing" secondItem="KFg-DG-VJj" secondAttribute="trailing" constant="16" id="WFI-wY-c44"/>
                                 <constraint firstItem="FUD-mv-Z7W" firstAttribute="centerX" secondItem="Cj7-w9-VFo" secondAttribute="centerX" id="ffS-Od-dPA"/>
                                 <constraint firstItem="hj2-Sz-yoI" firstAttribute="top" secondItem="KFg-DG-VJj" secondAttribute="bottom" constant="8" id="hf3-4I-v6O"/>
                                 <constraint firstItem="Q6o-Wj-idS" firstAttribute="top" secondItem="FUD-mv-Z7W" secondAttribute="bottom" constant="15" id="jXF-9D-Pc8"/>
                                 <constraint firstItem="pgz-3o-9OJ" firstAttribute="trailing" secondItem="KFg-DG-VJj" secondAttribute="trailing" id="ncn-Up-FOP"/>
-                                <constraint firstItem="Dfb-jr-3dr" firstAttribute="leading" secondItem="KFg-DG-VJj" secondAttribute="trailing" constant="5" id="noz-05-eWL"/>
                                 <constraint firstItem="sl8-xL-Pp2" firstAttribute="top" secondItem="pgz-3o-9OJ" secondAttribute="bottom" constant="8" id="rs5-ve-iPZ"/>
                                 <constraint firstItem="59a-SL-h8z" firstAttribute="leading" secondItem="KFg-DG-VJj" secondAttribute="leading" id="tKn-og-oY6"/>
                                 <constraint firstAttribute="trailing" secondItem="FUD-mv-Z7W" secondAttribute="trailing" constant="10" id="yDA-Ek-tR1"/>

+ 9 - 6
MusicGradeExam/MusicGradeExam/UI/RecordExam/Controller/RecordExamViewController.m

@@ -53,11 +53,6 @@
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
     [self configUI];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
     if (self.sourceModel) {
         [self evaluateSource];
     }
@@ -66,13 +61,18 @@
     }
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
+    
+}
+
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
     [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
     if(@available(iOS 13.0, *)){
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
     }
-    [self.topView stopDurationTimer];
 }
 
 - (void)requestData {
@@ -486,6 +486,9 @@
         }];
     }
 }
+- (void)dealloc {
+    [self.topView stopDurationTimer];
+}
 /*
 #pragma mark - Navigation