nothing

MusicGradeExam/MusicGradeExam/AppDelegate.m

@@ -524,9 +524,9 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         // Fallback on earlier versions
     }
     completionHandler();  // 系统要求执行这个方法
-    NSMutableDictionary *parm = [NSMutableDictionary dictionaryWithDictionary:userInfo];
-    
-    [self getVCUserInfoDict:parm];
+    [_lognDict removeAllObjects];
+    _lognDict =[NSMutableDictionary dictionaryWithDictionary:userInfo] ;
+    [self getVCUserInfoDict:_lognDict];
 }
 
 #pragma mark 根据不同消息跳转不同界面
@@ -660,4 +660,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     return (CustomNavViewController *)self.window.rootViewController;
 }
 
+#pragma mark 登录代理判断
+- (void)LoginIsSuccess:(BOOL)isSuccess {
+
+}
+
+
 @end

MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/Contents.json

@@ -9,17 +9,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 49,
-          "left" : 48,
-          "right" : 48,
-          "top" : 48
+          "left" : 49,
+          "right" : 49
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "2x"
     },
@@ -28,17 +25,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 73,
-          "left" : 73,
-          "right" : 73,
-          "top" : 73
+          "left" : 74,
+          "right" : 74
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "3x"
     }

MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/Contents.json

@@ -5,21 +5,18 @@
       "scale" : "1x"
     },
     {
-      "filename" : "button_nomal@2x.png",
+      "filename" : "button-normal@2x.png",
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 49,
-          "left" : 49,
-          "right" : 49,
-          "top" : 48
+          "left" : 50,
+          "right" : 50
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "2x"
     },
@@ -28,17 +25,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 73,
-          "left" : 73,
-          "right" : 73,
-          "top" : 73
+          "left" : 74,
+          "right" : 74
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "3x"
     }

MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/Contents.json

@@ -9,17 +9,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 49,
-          "left" : 49,
-          "right" : 49,
-          "top" : 48
+          "left" : 50,
+          "right" : 50
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "2x"
     },
@@ -28,17 +25,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 73,
-          "left" : 73,
-          "right" : 73,
-          "top" : 73
+          "left" : 75,
+          "right" : 75
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "3x"
     }

MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_wait.imageset/Contents.json

@@ -7,11 +7,33 @@
     {
       "filename" : "button_wait@2x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 50,
+          "right" : 50
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "2x"
     },
     {
       "filename" : "button_wait@3x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 75,
+          "right" : 75
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "3x"
     }
   ],

MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/Contents.json

@@ -9,17 +9,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 49,
-          "left" : 49,
-          "right" : 49,
-          "top" : 48
+          "left" : 50,
+          "right" : 50
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "2x"
     },
@@ -28,17 +25,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 73,
-          "left" : 73,
-          "right" : 73,
-          "top" : 73
+          "left" : 74,
+          "right" : 74
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "3x"
     }

MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/Contents.json

@@ -9,17 +9,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 49,
-          "left" : 49,
-          "right" : 49,
-          "top" : 48
+          "left" : 50,
+          "right" : 50
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "2x"
     },
@@ -28,17 +25,14 @@
       "idiom" : "universal",
       "resizing" : {
         "cap-insets" : {
-          "bottom" : 73,
-          "left" : 73,
-          "right" : 73,
-          "top" : 73
+          "left" : 74,
+          "right" : 74
         },
         "center" : {
-          "height" : 1,
           "mode" : "tile",
           "width" : 1
         },
-        "mode" : "9-part"
+        "mode" : "3-part-horizontal"
       },
       "scale" : "3x"
     }

MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -85,11 +85,11 @@
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://test.kj.colexiu.com")
-#define SEALCLASSHOST (@"https://test.kj.colexiu.com/api-im")
-#define WEBHOST (@"https://test.m.kj.colexiu.com")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"mgb7ka1nme0yg")
+//#define hostURL (@"https://test.kj.colexiu.com")
+//#define SEALCLASSHOST (@"https://test.kj.colexiu.com/api-im")
+//#define WEBHOST (@"https://test.m.kj.colexiu.com")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"mgb7ka1nme0yg")
 
 //#define hostURL (@"http://192.168.3.28:8000")
 //#define SEALCLASSHOST (@"http://192.168.3.28:8000/api-im")
@@ -105,11 +105,11 @@
 
 //#else    // 线上
 
-//#define hostURL (@"https://kj.colexiu.com")
-//#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
-//#define WEBHOST (@"https://m.kj.colexiu.com")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"8w7jv4qb8zuyy")
+#define hostURL (@"https://kj.colexiu.com")
+#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
+#define WEBHOST (@"https://m.kj.colexiu.com")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"8w7jv4qb8zuyy")
 
 //#endif
 

MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBottomView.m

@@ -36,8 +36,6 @@ typedef NS_ENUM(NSInteger, JOINBUTTONSTATUS) {
 
 @property (nonatomic, assign) BOOL hasAnimation;
 
-@property (weak, nonatomic) IBOutlet UIView *animationView;
-
 @end
 
 @implementation WaitExamBottomView
@@ -111,6 +109,7 @@ typedef NS_ENUM(NSInteger, JOINBUTTONSTATUS) {
         case JOINBUTTONSTATUS_FINISH:   // 已结束
         {
             self.joinButton.userInteractionEnabled = NO;
+            
             [self.joinButton setBackgroundImage:[UIImage imageNamed:@"button_unable"] forState:UIControlStateNormal];
             if (self.hasAnimation) {
                 self.hasAnimation = NO;

MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBottomView.xib

@@ -13,15 +13,6 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="130"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Gh-j0-ioZ">
-                    <rect key="frame" x="50" y="70" width="314" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
-                </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vNA-va-jtb">
                     <rect key="frame" x="50" y="10" width="314" height="50"/>
                     <constraints>
@@ -30,6 +21,11 @@
                     <state key="normal" title="设备检查及考试引导" backgroundImage="layer_buttonNomal">
                         <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="25"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
                     <connections>
                         <action selector="guideAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="PY4-WC-sQU"/>
                     </connections>
@@ -40,6 +36,11 @@
                         <constraint firstAttribute="height" constant="50" id="kvJ-uA-PNs"/>
                     </constraints>
                     <state key="normal" title="进入考场" backgroundImage="button_unable"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="25"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
                     <connections>
                         <action selector="joinAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="yRc-U4-W3U"/>
                     </connections>
@@ -50,17 +51,12 @@
                 <constraint firstItem="olr-Af-45x" firstAttribute="trailing" secondItem="vNA-va-jtb" secondAttribute="trailing" id="Amr-0k-YOy"/>
                 <constraint firstItem="vNA-va-jtb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="50" id="AnE-ci-nZb"/>
                 <constraint firstItem="vNA-va-jtb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="GDF-1L-JY1"/>
-                <constraint firstItem="8Gh-j0-ioZ" firstAttribute="trailing" secondItem="olr-Af-45x" secondAttribute="trailing" id="T19-g4-mpe"/>
-                <constraint firstItem="8Gh-j0-ioZ" firstAttribute="leading" secondItem="olr-Af-45x" secondAttribute="leading" id="Trb-EH-zkh"/>
                 <constraint firstItem="olr-Af-45x" firstAttribute="leading" secondItem="vNA-va-jtb" secondAttribute="leading" id="aFg-fR-GLo"/>
-                <constraint firstItem="8Gh-j0-ioZ" firstAttribute="bottom" secondItem="olr-Af-45x" secondAttribute="bottom" id="d4q-Pu-Vwa"/>
                 <constraint firstAttribute="trailing" secondItem="vNA-va-jtb" secondAttribute="trailing" constant="50" id="dgj-Ux-jWu"/>
-                <constraint firstItem="8Gh-j0-ioZ" firstAttribute="top" secondItem="olr-Af-45x" secondAttribute="top" id="mbq-Gb-alj"/>
                 <constraint firstItem="olr-Af-45x" firstAttribute="top" secondItem="vNA-va-jtb" secondAttribute="bottom" constant="10" id="uMT-7G-rE1"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="animationView" destination="8Gh-j0-ioZ" id="eSe-ew-3gN"/>
                 <outlet property="guideButton" destination="vNA-va-jtb" id="glR-xF-fkQ"/>
                 <outlet property="joinButton" destination="olr-Af-45x" id="OUE-E5-KvO"/>
             </connections>
@@ -68,7 +64,7 @@
         </view>
     </objects>
     <resources>
-        <image name="button_unable" width="49.5" height="49"/>
-        <image name="layer_buttonNomal" width="49.5" height="49"/>
+        <image name="button_unable" width="340" height="50"/>
+        <image name="layer_buttonNomal" width="340" height="50"/>
     </resources>
 </document>

MusicGradeExam/MusicGradeExam/UI/Login/Controller/LoginViewController.m

@@ -93,7 +93,7 @@
                 MJWeakSelf;
                 [self KSShowMsg:@"登录成功" promptCompletion:^{
                     [weakSelf toHomeView];
-                    if (self.delegate) {
+                    if (self.delegate && [self.delegate respondsToSelector:@selector(LoginIsSuccess:)]) {
                         [self.delegate LoginIsSuccess:YES];
                     }
                 }];