Browse Source

按钮添加高亮状态

Steven 5 năm trước cách đây
mục cha
commit
b42208b17a
45 tập tin đã thay đổi với 216 bổ sung109 xóa
  1. 1 1
      MusicGradeExam/MusicGradeExam/AppDelegate.m
  2. 2 2
      MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/Contents.json
  3. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@2x.png
  4. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@3x-1.png
  5. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@3x.png
  6. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_message.imageset/empty_message@2x.png
  7. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_message.imageset/empty_message@3x.png
  8. 6 0
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/Contents.json
  9. 22 0
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/Contents.json
  10. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/button_highlight@2x.png
  11. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/button_highlight@3x.png
  12. 22 0
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/Contents.json
  13. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/button_nomal@2x.png
  14. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/button_nomal@3x.png
  15. 22 0
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/Contents.json
  16. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/button_unable@2x.png
  17. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/button_unable@3x.png
  18. 22 0
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/Contents.json
  19. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/layer_buttonHighlight@2x.png
  20. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/layer_buttonHighlight@3x.png
  21. 22 0
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/Contents.json
  22. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/layer_buttonNomal@2x.png
  23. BIN
      MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/layer_buttonNomal@3x.png
  24. 1 1
      MusicGradeExam/MusicGradeExam/KSRequestManager.m
  25. 1 1
      MusicGradeExam/MusicGradeExam/Tools/Custom/KSStatusView.m
  26. 3 3
      MusicGradeExam/MusicGradeExam/UI/Exam/View/ExamDeviceCheckView.xib
  27. 4 0
      MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.m
  28. 1 6
      MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.xib
  29. 6 6
      MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBodyView.m
  30. 5 20
      MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBodyView.xib
  31. 2 0
      MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Controller/ExamViewController.m
  32. 15 15
      MusicGradeExam/MusicGradeExam/UI/Home/View/HomeBodyView.xib
  33. 5 5
      MusicGradeExam/MusicGradeExam/UI/Login/View/LoginBodyView.xib
  34. 3 0
      MusicGradeExam/MusicGradeExam/UI/Login/View/ModifyBodyView.m
  35. 6 8
      MusicGradeExam/MusicGradeExam/UI/Login/View/ModifyBodyView.xib
  36. 1 1
      MusicGradeExam/MusicGradeExam/UI/Login/View/RegisterBodyView.m
  37. 2 2
      MusicGradeExam/MusicGradeExam/UI/Login/View/RegisterBodyView.xib
  38. 3 0
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.m
  39. 6 3
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.xib
  40. 3 0
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneChangeBodyView.m
  41. 6 19
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneChangeBodyView.xib
  42. 3 0
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneCheckBodyView.m
  43. 6 8
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneCheckBodyView.xib
  44. 9 0
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/SettingBodyView.m
  45. 6 8
      MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/SettingBodyView.xib

+ 1 - 1
MusicGradeExam/MusicGradeExam/AppDelegate.m

@@ -81,7 +81,7 @@
     // Override point for customization after application launch.
     // bugly
     [Bugly startWithAppId:@"55e73c16f6"];
-    
+    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     if (@available(iOS 13, *)) {
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;

+ 2 - 2
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "empty_library@2x.png",
+      "filename" : "empty_library@3x-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "empty_library@3x.png",
+      "filename" : "empty_library@2x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@3x-1.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@3x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_message.imageset/empty_message@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_message.imageset/empty_message@3x.png


+ 6 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "button_highlight@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "button_highlight@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/button_highlight@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_highlight.imageset/button_highlight@3x.png


+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "button_nomal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "button_nomal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/button_nomal@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_nomal.imageset/button_nomal@3x.png


+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "button_unable@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "button_unable@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/button_unable@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/button_unable.imageset/button_unable@3x.png


+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "layer_buttonHighlight@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "layer_buttonHighlight@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/layer_buttonHighlight@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonHighlight.imageset/layer_buttonHighlight@3x.png


+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "layer_buttonNomal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "layer_buttonNomal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/layer_buttonNomal@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/buttonStatus/layer_buttonNomal.imageset/layer_buttonNomal@3x.png


+ 1 - 1
MusicGradeExam/MusicGradeExam/KSRequestManager.m

@@ -637,7 +637,7 @@
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:phone forKey:@"phone"];
     [parm setValue:password forKey:@"password"];
-    [self request:get url:url parm:nil success:success faliure:faliure];
+    [self request:get url:url parm:parm success:success faliure:faliure];
 }
 
 // /api-auth/user/updatePhone

+ 1 - 1
MusicGradeExam/MusicGradeExam/Tools/Custom/KSStatusView.m

@@ -84,7 +84,7 @@
 }
 
 - (CGFloat)getButtonWidth:(NSString *)buttonTitle {
-    return [buttonTitle boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, 30) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13.0f]} context:nil].size.width + 24;
+    return [buttonTitle boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, 30) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13.0f]} context:nil].size.width + 50;
 }
 
 - (void)buttonClickAction {

+ 3 - 3
MusicGradeExam/MusicGradeExam/UI/Exam/View/ExamDeviceCheckView.xib

@@ -15,12 +15,12 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Zj-N7-Kkf">
-                    <rect key="frame" x="26" y="64" width="362" height="35.5"/>
+                    <rect key="frame" x="26" y="64" width="362" height="37.5"/>
                     <attributedString key="attributedText">
                         <fragment content="为保证正常考级,现从声音、网络、设备位置等方面进行测试">
                             <attributes>
                                 <color key="NSColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
-                                <font key="NSFont" size="14" name=".PingFangSC-Regular"/>
+                                <font key="NSFont" metaFont="menu" size="14"/>
                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                             </attributes>
                         </fragment>
@@ -28,7 +28,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-Kl-Ad2">
-                    <rect key="frame" x="0.0" y="99.5" width="414" height="350"/>
+                    <rect key="frame" x="0.0" y="101.5" width="414" height="350"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_device" translatesAutoresizingMaskIntoConstraints="NO" id="9hS-C8-9oD">
                             <rect key="frame" x="136.5" y="32" width="141" height="100"/>

+ 4 - 0
MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.m

@@ -40,6 +40,8 @@
 @property (weak, nonatomic) IBOutlet UIImageView *backImage;
 @property (weak, nonatomic) IBOutlet UIButton *backButton;
 
+@property (weak, nonatomic) IBOutlet UIButton *enterButton;
+
 @end
 
 @implementation TicketBodyView
@@ -51,6 +53,8 @@
     self.backImage.hidden = YES;
     self.backButton.hidden = YES;
     self.emptyView.hidden = YES;
+    [self.enterButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+    [self.enterButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
 }
 
 + (instancetype)shareInstance {

+ 1 - 6
MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.xib

@@ -180,16 +180,10 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zcb-sN-Ifk">
                     <rect key="frame" x="17" y="546" width="380" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="u1K-X7-Iyg"/>
                     </constraints>
                     <state key="normal" title="进入教室"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
                     <connections>
                         <action selector="joinRoom:" destination="iN0-l3-epB" eventType="touchUpInside" id="RDY-fN-nBu"/>
                     </connections>
@@ -250,6 +244,7 @@
                 <outlet property="certificateImage" destination="A1y-sO-QGA" id="1hP-L1-7bc"/>
                 <outlet property="classLocation" destination="sl8-xL-Pp2" id="lJl-Bf-X7B"/>
                 <outlet property="emptyView" destination="SEt-dI-9WR" id="36y-OS-5PH"/>
+                <outlet property="enterButton" destination="Zcb-sN-Ifk" id="loX-Vr-Ait"/>
                 <outlet property="examLevel" destination="baH-bx-beF" id="9MK-50-ube"/>
                 <outlet property="examTime" destination="pgz-3o-9OJ" id="S2z-he-SzZ"/>
                 <outlet property="subjectLabel" destination="Yik-4s-H4Q" id="FGR-yT-aw3"/>

+ 6 - 6
MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBodyView.m

@@ -24,9 +24,8 @@ typedef NS_ENUM(NSInteger,EXAMSTATUS) {
 
 @property (weak, nonatomic) IBOutlet UILabel *classTime;
 
-@property (weak, nonatomic) IBOutlet UILabel *waitLabel;
-
 @property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
+@property (weak, nonatomic) IBOutlet UIButton *guideButton;
 
 @property (nonatomic, copy) JoinRoomAction callback;
 
@@ -39,6 +38,8 @@ typedef NS_ENUM(NSInteger,EXAMSTATUS) {
 @implementation WaitExamBodyView
 - (void)awakeFromNib {
     [super awakeFromNib];
+    [self.guideButton setBackgroundImage:[UIImage imageNamed:@"layer_buttonNomal"] forState:UIControlStateNormal];
+    [self.guideButton setBackgroundImage:[UIImage imageNamed:@"layer_buttonHighlight"] forState:UIControlStateHighlighted];
 }
 
 
@@ -93,8 +94,6 @@ typedef NS_ENUM(NSInteger,EXAMSTATUS) {
     
     self.classDate.text = [[self.sourceModel.examStartTime componentsSeparatedByString:@" "] firstObject];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:self.sourceModel.baseExamName];
-
-    self.waitLabel.text = [NSString stringWithFormat:@"%.0f位考生",self.sourceModel.waitNum];
     
     // 时间
     NSDateFormatter *dateFormatter=[[NSDateFormatter alloc] init];
@@ -170,11 +169,12 @@ typedef NS_ENUM(NSInteger,EXAMSTATUS) {
     _canJoinRoom = canJoinRoom;
     if (canJoinRoom) {
         self.joinButton.userInteractionEnabled = YES;
-        [self.joinButton setBackgroundColor:THEMECOLOR];
+        [self.joinButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+        [self.joinButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
     }
     else {
         self.joinButton.userInteractionEnabled = NO;
-        [self.joinButton setBackgroundColor:HexRGB(0xcccccc)];
+        [self.joinButton setBackgroundImage:[UIImage imageNamed:@"button_unable"] forState:UIControlStateNormal];
     }
 }
 

+ 5 - 20
MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBodyView.xib

@@ -175,40 +175,22 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8bl-8o-KNJ">
                     <rect key="frame" x="17" y="466" width="380" height="50"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="gcf-YI-Gnf"/>
                     </constraints>
-                    <state key="normal" title="设备检查及考试引导">
+                    <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="borderWidth">
-                            <real key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                            <color key="value" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
                     <connections>
                         <action selector="guideAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="szD-ot-0hU"/>
                     </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I8H-IY-JIX">
                     <rect key="frame" x="16" y="526" width="382" height="50"/>
-                    <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="fRv-bF-dQZ"/>
                     </constraints>
-                    <state key="normal" title="进入教室"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
+                    <state key="normal" title="进入教室" backgroundImage="button_unable"/>
                     <connections>
                         <action selector="joinAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Zoc-Q5-JHh"/>
                     </connections>
@@ -238,6 +220,7 @@
                 <outlet property="classDate" destination="qLV-gz-q1k" id="deW-pB-idj"/>
                 <outlet property="classTime" destination="Czx-Hb-wZ8" id="irw-eT-XKg"/>
                 <outlet property="examMessageView" destination="Pa9-Km-YvF" id="xvc-mw-5ne"/>
+                <outlet property="guideButton" destination="8bl-8o-KNJ" id="1MP-3g-ljh"/>
                 <outlet property="joinButton" destination="I8H-IY-JIX" id="cAC-Ad-PuS"/>
                 <outlet property="signButton" destination="WEa-ER-E4J" id="Ft8-JM-Rw6"/>
                 <outlet property="signDescLabel" destination="O3Y-5U-nUH" id="tBU-Y1-qvd"/>
@@ -249,6 +232,8 @@
         </view>
     </objects>
     <resources>
+        <image name="button_unable" width="340" height="49"/>
+        <image name="layer_buttonNomal" width="340" height="49"/>
         <image name="sign_noOpen" width="164" height="164"/>
     </resources>
 </document>

+ 2 - 0
MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Controller/ExamViewController.m

@@ -26,6 +26,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self allocTitle:@"考级曲库"];
+    
     [self configUI];
 }
 
@@ -35,6 +36,7 @@
     if(@available(iOS 13.0, *)){
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
     }
+    [self resetParamenter];
     [self requestData];
 }
 

+ 15 - 15
MusicGradeExam/MusicGradeExam/UI/Home/View/HomeBodyView.xib

@@ -65,7 +65,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" tag="1002" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="book_record" translatesAutoresizingMaskIntoConstraints="NO" id="FTX-tf-JYt">
-                    <rect key="frame" x="12" y="251.5" width="392" height="134"/>
+                    <rect key="frame" x="12" y="246.5" width="392" height="134"/>
                     <gestureRecognizers/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="FTX-tf-JYt" secondAttribute="height" multiplier="351:120" id="jrs-LK-ywg"/>
@@ -75,7 +75,7 @@
                     </connections>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="报考记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="71n-fC-CqF">
-                    <rect key="frame" x="32" y="293.5" width="74" height="25"/>
+                    <rect key="frame" x="32" y="288.5" width="74" height="25"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="MxA-yU-X9o"/>
                     </constraints>
@@ -84,14 +84,14 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" tag="1003" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="exam_record" translatesAutoresizingMaskIntoConstraints="NO" id="X8m-zH-diL">
-                    <rect key="frame" x="12" y="400.5" width="392" height="134"/>
+                    <rect key="frame" x="12" y="385.5" width="392" height="134"/>
                     <gestureRecognizers/>
                     <connections>
                         <outletCollection property="gestureRecognizers" destination="g0m-kn-yMe" appends="YES" id="J0N-dX-A4b"/>
                     </connections>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您即将进行的考试" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0E-93-7ac">
-                    <rect key="frame" x="32" y="474.5" width="114.5" height="20"/>
+                    <rect key="frame" x="32" y="459.5" width="114.5" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="eD7-7U-5gB"/>
                     </constraints>
@@ -100,7 +100,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考试记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g1C-Ty-W4n">
-                    <rect key="frame" x="32" y="442.5" width="74" height="25"/>
+                    <rect key="frame" x="32" y="427.5" width="74" height="25"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="tTe-yW-e14"/>
                     </constraints>
@@ -109,10 +109,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="record_detail" translatesAutoresizingMaskIntoConstraints="NO" id="lSQ-oa-URI">
-                    <rect key="frame" x="151.5" y="475.5" width="14" height="18"/>
+                    <rect key="frame" x="151.5" y="460.5" width="14" height="18"/>
                 </imageView>
                 <imageView clipsSubviews="YES" tag="1004" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_library" translatesAutoresizingMaskIntoConstraints="NO" id="6jn-Ca-srp">
-                    <rect key="frame" x="12" y="549.5" width="392" height="134"/>
+                    <rect key="frame" x="12" y="524.5" width="392" height="134"/>
                     <gestureRecognizers/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="6jn-Ca-srp" secondAttribute="height" multiplier="351:120" id="We3-pT-D82"/>
@@ -122,7 +122,7 @@
                     </connections>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进入考级曲库" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gd1-H6-mZc">
-                    <rect key="frame" x="32" y="623.5" width="86" height="20"/>
+                    <rect key="frame" x="32" y="598.5" width="86" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="oVm-Ho-adW"/>
                     </constraints>
@@ -131,7 +131,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考级曲库" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylI-OI-Itq">
-                    <rect key="frame" x="32" y="591.5" width="74" height="25"/>
+                    <rect key="frame" x="32" y="566.5" width="74" height="25"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="ClN-i1-S5V"/>
                     </constraints>
@@ -140,10 +140,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="record_detail" translatesAutoresizingMaskIntoConstraints="NO" id="3du-vq-z5T">
-                    <rect key="frame" x="123" y="624.5" width="14" height="18"/>
+                    <rect key="frame" x="123" y="599.5" width="14" height="18"/>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您的报考记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aDg-7e-SV3">
-                    <rect key="frame" x="32" y="325.5" width="86" height="20"/>
+                    <rect key="frame" x="32" y="320.5" width="86" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="LRW-oG-3IF"/>
                     </constraints>
@@ -152,12 +152,12 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="record_detail" translatesAutoresizingMaskIntoConstraints="NO" id="J1M-Gy-55Y">
-                    <rect key="frame" x="123" y="326.5" width="14" height="18"/>
+                    <rect key="frame" x="123" y="321.5" width="14" height="18"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" red="0.95294117647058818" green="0.95686274509803915" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
-                <constraint firstItem="FTX-tf-JYt" firstAttribute="top" secondItem="deZ-CC-Tlw" secondAttribute="bottom" constant="15" id="0OE-L8-r85"/>
+                <constraint firstItem="FTX-tf-JYt" firstAttribute="top" secondItem="deZ-CC-Tlw" secondAttribute="bottom" constant="10" id="0OE-L8-r85"/>
                 <constraint firstItem="y0E-93-7ac" firstAttribute="leading" secondItem="g1C-Ty-W4n" secondAttribute="leading" id="1hr-61-kkQ"/>
                 <constraint firstAttribute="trailing" secondItem="FTX-tf-JYt" secondAttribute="trailing" constant="10" id="2ha-2A-PGC"/>
                 <constraint firstItem="deZ-CC-Tlw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="16" id="3Kr-dw-VIu"/>
@@ -178,7 +178,7 @@
                 <constraint firstItem="71n-fC-CqF" firstAttribute="leading" secondItem="FTX-tf-JYt" secondAttribute="leading" constant="20" id="VpC-SF-2LZ"/>
                 <constraint firstItem="3du-vq-z5T" firstAttribute="centerY" secondItem="Gd1-H6-mZc" secondAttribute="centerY" id="WOA-Fd-oVt"/>
                 <constraint firstItem="qJ1-Pm-qsl" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="16" id="XWG-Hi-LXu"/>
-                <constraint firstItem="6jn-Ca-srp" firstAttribute="top" secondItem="X8m-zH-diL" secondAttribute="bottom" constant="15" id="Xdu-ZS-WnO"/>
+                <constraint firstItem="6jn-Ca-srp" firstAttribute="top" secondItem="X8m-zH-diL" secondAttribute="bottom" constant="5" id="Xdu-ZS-WnO"/>
                 <constraint firstItem="lSQ-oa-URI" firstAttribute="leading" secondItem="y0E-93-7ac" secondAttribute="trailing" constant="5" id="duC-ZB-gBe"/>
                 <constraint firstItem="X8m-zH-diL" firstAttribute="trailing" secondItem="FTX-tf-JYt" secondAttribute="trailing" id="eLs-5L-Yai"/>
                 <constraint firstItem="ylI-OI-Itq" firstAttribute="leading" secondItem="6jn-Ca-srp" secondAttribute="leading" constant="20" id="gmk-5l-Qbf"/>
@@ -194,7 +194,7 @@
                 <constraint firstItem="ylI-OI-Itq" firstAttribute="bottom" secondItem="6jn-Ca-srp" secondAttribute="centerY" id="xHE-4u-yL6"/>
                 <constraint firstItem="aDg-7e-SV3" firstAttribute="leading" secondItem="71n-fC-CqF" secondAttribute="leading" id="xNP-fv-2MS"/>
                 <constraint firstItem="qJ1-Pm-qsl" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="34" id="z7t-8v-nwm"/>
-                <constraint firstItem="X8m-zH-diL" firstAttribute="top" secondItem="FTX-tf-JYt" secondAttribute="bottom" constant="15" id="zqL-CI-vbV"/>
+                <constraint firstItem="X8m-zH-diL" firstAttribute="top" secondItem="FTX-tf-JYt" secondAttribute="bottom" constant="5" id="zqL-CI-vbV"/>
             </constraints>
             <connections>
                 <outlet property="bgHeight" destination="2Ow-0T-1Ld" id="wrY-ii-pAl"/>

+ 5 - 5
MusicGradeExam/MusicGradeExam/UI/Login/View/LoginBodyView.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" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -126,7 +126,7 @@
                     </connections>
                 </button>
                 <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9PA-OB-j1p">
-                    <rect key="frame" x="40" y="442" width="72" height="29"/>
+                    <rect key="frame" x="302" y="442" width="72" height="29"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <state key="normal" title="验证码登录">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -136,7 +136,7 @@
                     </connections>
                 </button>
                 <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cI2-Yc-Rji">
-                    <rect key="frame" x="316" y="442" width="58" height="29"/>
+                    <rect key="frame" x="40" y="442" width="58" height="29"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <state key="normal" title="忘记密码">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -151,16 +151,16 @@
                 <constraint firstItem="2dd-ga-UBv" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="3Ec-Mx-zzm"/>
                 <constraint firstItem="2dd-ga-UBv" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="120" id="3dm-l0-B3f"/>
                 <constraint firstItem="uyt-ih-0IW" firstAttribute="trailing" secondItem="iN0-l3-epB" secondAttribute="trailing" id="5bE-Op-m2y"/>
-                <constraint firstItem="9PA-OB-j1p" firstAttribute="leading" secondItem="Z6M-LD-AZN" secondAttribute="leading" id="9FC-gU-Fe2"/>
                 <constraint firstItem="gMg-ta-wey" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="DJz-3E-sks"/>
                 <constraint firstItem="5T6-up-5cr" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="40" id="Eup-gp-u5d"/>
-                <constraint firstItem="cI2-Yc-Rji" firstAttribute="trailing" secondItem="Z6M-LD-AZN" secondAttribute="trailing" id="EzB-RQ-LwZ"/>
                 <constraint firstItem="Z6M-LD-AZN" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="40" id="JPb-Lk-rBz"/>
                 <constraint firstItem="uyt-ih-0IW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Jns-om-CLA"/>
                 <constraint firstItem="Z6M-LD-AZN" firstAttribute="top" secondItem="5T6-up-5cr" secondAttribute="bottom" constant="30" id="Neq-N7-aa9"/>
                 <constraint firstItem="5T6-up-5cr" firstAttribute="top" secondItem="2dd-ga-UBv" secondAttribute="bottom" constant="65" id="SZl-9J-AjE"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="sKD-AJ-pKW" secondAttribute="trailing" constant="16" id="VWU-JJ-bZv"/>
                 <constraint firstAttribute="bottom" secondItem="uyt-ih-0IW" secondAttribute="bottom" id="aci-mi-gMQ"/>
+                <constraint firstItem="9PA-OB-j1p" firstAttribute="trailing" secondItem="Z6M-LD-AZN" secondAttribute="trailing" id="c1u-3R-XTD"/>
+                <constraint firstItem="cI2-Yc-Rji" firstAttribute="leading" secondItem="Z6M-LD-AZN" secondAttribute="leading" id="c9Y-67-g8E"/>
                 <constraint firstItem="uyt-ih-0IW" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="eIx-Ye-xud"/>
                 <constraint firstItem="cI2-Yc-Rji" firstAttribute="top" secondItem="Z6M-LD-AZN" secondAttribute="bottom" constant="15" id="gzn-hM-KN3"/>
                 <constraint firstItem="XLo-v0-MR2" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="17" id="h5x-Cf-Fg5"/>

+ 3 - 0
MusicGradeExam/MusicGradeExam/UI/Login/View/ModifyBodyView.m

@@ -18,6 +18,7 @@
 @property (weak, nonatomic) IBOutlet UITextField *pwdField;
 
 @property (weak, nonatomic) IBOutlet UITextField *codeField;
+@property (weak, nonatomic) IBOutlet UIButton *sureButton;
 
 @end
 
@@ -32,6 +33,8 @@
     self.phoneField.delegate = self;
     self.pwdField.delegate = self;
     self.codeField.delegate = self;
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
 }
 
 + (instancetype)shareInstance {

+ 6 - 8
MusicGradeExam/MusicGradeExam/UI/Login/View/ModifyBodyView.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" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -89,16 +89,10 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eLd-eA-XmB">
                     <rect key="frame" x="17" y="253" width="380" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="uYG-7a-FwI"/>
                     </constraints>
-                    <state key="normal" title="确认"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
+                    <state key="normal" title="确认" backgroundImage="button_nomal"/>
                     <connections>
                         <action selector="sureAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Eio-lr-a8v"/>
                     </connections>
@@ -125,8 +119,12 @@
                 <outlet property="codeField" destination="WBQ-Pf-zKW" id="4zI-Bk-QPi"/>
                 <outlet property="phoneField" destination="uYT-Fc-zKn" id="1p6-iT-Ara"/>
                 <outlet property="pwdField" destination="Efg-Kj-Z58" id="aQq-gj-O0y"/>
+                <outlet property="sureButton" destination="eLd-eA-XmB" id="A3u-Du-P2T"/>
             </connections>
             <point key="canvasLocation" x="132" y="109"/>
         </view>
     </objects>
+    <resources>
+        <image name="button_nomal" width="340" height="49"/>
+    </resources>
 </document>

+ 1 - 1
MusicGradeExam/MusicGradeExam/UI/Login/View/RegisterBodyView.m

@@ -34,7 +34,7 @@
     
     [self.bgView.layer addSublayer:self.gradientLayer];
     self.bgView.layer.masksToBounds = YES;
-    NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:@"登录即代表同意酷乐秀用户协议"];
+    NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:@"注册即代表同意酷乐秀用户协议"];
     [attr setAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(0, 14)];
     [attr setAttributes:@{NSUnderlineStyleAttributeName:@(NSUnderlineStyleSingle),NSForegroundColorAttributeName:[UIColor whiteColor]} range:NSMakeRange(10, 4)];
     [self.protocalButton setAttributedTitle:attr forState:UIControlStateNormal];

+ 2 - 2
MusicGradeExam/MusicGradeExam/UI/Login/View/RegisterBodyView.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" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -135,7 +135,7 @@
                 <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VQs-QM-Kn6">
                     <rect key="frame" x="20" y="813" width="374" height="29"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <state key="normal" title="登录即代表同意酷乐秀用户协议"/>
+                    <state key="normal" title="注册即代表同意酷乐秀用户协议"/>
                     <connections>
                         <action selector="buttonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="YiR-Ju-2hg"/>
                     </connections>

+ 3 - 0
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.m

@@ -18,6 +18,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *wxContact;
 @property (weak, nonatomic) IBOutlet UILabel *emailContact;
 
+@property (weak, nonatomic) IBOutlet UIButton *sureButton;
 @property (nonatomic, copy) SubmitAction action;
 
 @end
@@ -33,6 +34,8 @@
     _wxContact.text = @"微信公众号:酷乐秀App";
     _emailContact.text = @"邮箱:super_orchestra@163.com";
     
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
 }
 
 + (instancetype)shareInstance {

+ 6 - 3
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/FeedbackBodyView.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"/>
@@ -72,12 +72,11 @@
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ct3-4Y-vZj">
                     <rect key="frame" x="28" y="465" width="358" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="67L-cr-A5R"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                    <state key="normal" title="提交"/>
+                    <state key="normal" title="提交" backgroundImage="button_nomal"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                             <real key="value" value="25"/>
@@ -145,10 +144,14 @@
                 <outlet property="contactField" destination="XAw-28-RHh" id="OuF-T2-JEo"/>
                 <outlet property="emailContact" destination="Lsw-Mu-XKa" id="Kob-36-JuJ"/>
                 <outlet property="inputText" destination="p8m-Qr-UiJ" id="lmH-vA-8di"/>
+                <outlet property="sureButton" destination="Ct3-4Y-vZj" id="L5J-AS-ajq"/>
                 <outlet property="tipsLabel" destination="tu9-z8-FwU" id="Gm4-Ph-99u"/>
                 <outlet property="wxContact" destination="RQx-jz-yxS" id="pPX-oC-TCn"/>
             </connections>
             <point key="canvasLocation" x="137.68115942028987" y="118.52678571428571"/>
         </view>
     </objects>
+    <resources>
+        <image name="button_nomal" width="340" height="49"/>
+    </resources>
 </document>

+ 3 - 0
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneChangeBodyView.m

@@ -15,6 +15,7 @@
 @property (weak, nonatomic) IBOutlet UITextField *codeField;
 
 @property (nonatomic, copy) ChangePhoneBlock callback;
+@property (weak, nonatomic) IBOutlet UIButton *sureButton;
 
 @end
 
@@ -24,6 +25,8 @@
     [super awakeFromNib];
     self.phoneField.delegate = self;
     self.codeField.delegate = self;
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
 }
 
 + (instancetype)shareInstance {

+ 6 - 19
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneChangeBodyView.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"/>
@@ -51,17 +51,6 @@
                             <state key="normal" title="发送验证码">
                                 <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                             </state>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                    <real key="value" value="1"/>
-                                </userDefinedRuntimeAttribute>
-                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                    <color key="value" red="0.078431372550000003" green="0.57254901960000004" blue="0.54117647059999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </userDefinedRuntimeAttribute>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="15"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
                             <connections>
                                 <action selector="sendCode:" destination="iN0-l3-epB" eventType="touchUpInside" id="Eks-QD-Erc"/>
                             </connections>
@@ -80,17 +69,11 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hhn-N2-gSx">
                     <rect key="frame" x="32" y="150" width="350" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="Lq9-Fh-flN"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                    <state key="normal" title="确认"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
+                    <state key="normal" title="确认" backgroundImage="button_nomal"/>
                     <connections>
                         <action selector="sureAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="ULx-Yi-K9A"/>
                     </connections>
@@ -113,8 +96,12 @@
                 <outlet property="codeButton" destination="4K0-7F-TYa" id="Bel-W0-1Df"/>
                 <outlet property="codeField" destination="7xW-HC-zas" id="627-NI-W9o"/>
                 <outlet property="phoneField" destination="9l2-SF-nsA" id="ziV-GQ-qPh"/>
+                <outlet property="sureButton" destination="Hhn-N2-gSx" id="3Pu-az-bj8"/>
             </connections>
             <point key="canvasLocation" x="132" y="113"/>
         </view>
     </objects>
+    <resources>
+        <image name="button_nomal" width="340" height="49"/>
+    </resources>
 </document>

+ 3 - 0
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneCheckBodyView.m

@@ -11,6 +11,7 @@
 @interface PhoneCheckBodyView ()<UITextFieldDelegate>
 
 @property (nonatomic, copy) CheckCallback callback;
+@property (weak, nonatomic) IBOutlet UIButton *sureButton;
 
 @end
 
@@ -23,6 +24,8 @@
     }
     self.phoneField.delegate = self;
     self.passwordField.delegate = self;
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+    [self.sureButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
 }
 
 + (instancetype)shareInstance {

+ 6 - 8
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/PhoneCheckBodyView.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" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -54,17 +54,11 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fVz-og-KBl">
                     <rect key="frame" x="18" y="150" width="378" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="Ur1-jX-Eqx"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                    <state key="normal" title="确认"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
+                    <state key="normal" title="确认" backgroundImage="button_nomal"/>
                     <connections>
                         <action selector="sureAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Gct-MQ-yJU"/>
                     </connections>
@@ -87,8 +81,12 @@
             <connections>
                 <outlet property="passwordField" destination="Wed-N0-vns" id="MWb-f6-sjM"/>
                 <outlet property="phoneField" destination="7R1-Eu-fzD" id="m4s-kE-NLN"/>
+                <outlet property="sureButton" destination="fVz-og-KBl" id="3vi-8y-tJA"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="-2.0089285714285712"/>
         </view>
     </objects>
+    <resources>
+        <image name="button_nomal" width="340" height="49"/>
+    </resources>
 </document>

+ 9 - 0
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/SettingBodyView.m

@@ -12,10 +12,19 @@
 
 @property (nonatomic, copy) SettingBlock block;
 
+@property (weak, nonatomic) IBOutlet UIButton *logoutButton;
+
+
 @end
 
 @implementation SettingBodyView
 
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self.logoutButton setBackgroundImage:[UIImage imageNamed:@"button_nomal"] forState:UIControlStateNormal];
+    [self.logoutButton setBackgroundImage:[UIImage imageNamed:@"button_highlight"] forState:UIControlStateHighlighted];
+}
+
 + (instancetype)shareInstance {
     SettingBodyView *view = [[[NSBundle mainBundle] loadNibNamed:@"SettingBodyView" owner:nil options:nil] firstObject];
     return view;

+ 6 - 8
MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/View/SettingBodyView.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" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -166,16 +166,10 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y36-RD-xmU">
                     <rect key="frame" x="18" y="359" width="378" height="50"/>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="58a-XI-vEX"/>
                     </constraints>
-                    <state key="normal" title="退出登录"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="25"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
+                    <state key="normal" title="退出登录" backgroundImage="button_nomal"/>
                     <connections>
                         <action selector="logoutAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="9Ca-Su-Mus"/>
                     </connections>
@@ -203,6 +197,9 @@
                 <constraint firstItem="o2S-Zi-KjH" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="13" id="zsx-FL-Ma6"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <connections>
+                <outlet property="logoutButton" destination="y36-RD-xmU" id="IyE-4e-lss"/>
+            </connections>
             <point key="canvasLocation" x="132" y="123"/>
         </view>
         <tapGestureRecognizer id="8Gn-eu-1bh">
@@ -232,6 +229,7 @@
         </tapGestureRecognizer>
     </objects>
     <resources>
+        <image name="button_nomal" width="340" height="49"/>
         <image name="mine_next" width="22" height="22"/>
     </resources>
 </document>