瀏覽代碼

bug修复

Steven 5 年之前
父節點
當前提交
9181a90c8a

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

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

+ 0 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@3x-1.png → MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/empty_library@3x.png


+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/Login/login_unable.imageset/Contents.json

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

二進制
MusicGradeExam/MusicGradeExam/Assets.xcassets/Login/login_unable.imageset/login_unable@2x.png


二進制
MusicGradeExam/MusicGradeExam/Assets.xcassets/Login/login_unable.imageset/login_unable@3x.png


+ 1 - 0
MusicGradeExam/MusicGradeExam/Base/KSBaseWKWebViewController.m

@@ -130,6 +130,7 @@
 
 - (NSString *)url {
     if (_url) {
+#warning 修改
         NSString *sepectString = [_url containsString:@"?"] ? @"&" : @"?";
         NSString *token = [[NSString stringWithFormat:@"Authorization=%@ %@", UserDefault(Token_type), UserDefault(TokenKey)] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
         _url = [NSString stringWithFormat:@"%@%@%@",_url, sepectString, token];

+ 6 - 3
MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/Model/Classroom.m

@@ -104,6 +104,9 @@
 }
 
 - (RoomMember *)getMember:(NSString *)userId {
+    if ([userId isEqualToString:self.currentMember.userId]) {
+        return self.currentMember;
+    }
     for(RoomMember *mem in self.memberList) {
         if([mem.userId isEqualToString:userId]) {
             return mem;
@@ -173,9 +176,9 @@
     return nil;
 }
 
-//- (RoomMember *)currentMember {
-//    return [self getMember:self.currentMemberId];
-//}
+- (RoomMember *)currentMember {
+    return [self getMember:self.currentMemberId];
+}
 
 - (int)getMemberCountWithoutAudience {
     int count = 0;

+ 20 - 6
MusicGradeExam/MusicGradeExam/UI/Login/View/FSBodyView.m

@@ -22,6 +22,7 @@
 
 @property (nonatomic, copy) SettingCallback callback;
 
+@property (weak, nonatomic) IBOutlet UIButton *enterButton;
 
 @end
 
@@ -31,11 +32,11 @@
     [super awakeFromNib];
     
     self.nameField.tintColor = self.nameField.textColor;
-    self.nameField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入用户名或学生报名姓名" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.nameField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入用户名或学生报名姓名" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     self.passwordField.delegate = self;
     self.passwordField.tintColor = self.passwordField.textColor;
-    self.passwordField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入登录密码" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.passwordField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入登录密码" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     self.sPasswordField.delegate = self;
     self.sPasswordField.tintColor = self.sPasswordField.textColor;
@@ -69,10 +70,7 @@
 
 - (IBAction)sureAction:(id)sender {
     [self endEditing:YES];
-//    if ([NSString isEmptyString:self.nameField.text]) {
-//        [self MBPShow:@"请输入用户名"];
-//        return;
-//    }
+
     if ([NSString isEmptyString:self.passwordField.text]) {
         [self MBPShow:@"请设置密码"];
         return;
@@ -101,6 +99,22 @@
     return YES;
 }
 
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    // 判断
+    [self checkEnterButtonStatus];
+}
+
+- (void)checkEnterButtonStatus {
+    if (![NSString isEmptyString:_passwordField.text] &&![NSString isEmptyString:_sPasswordField.text]) {
+        self.enterButton.userInteractionEnabled = YES;
+        [self.enterButton setBackgroundImage:[UIImage imageNamed:@"login_enter"] forState:UIControlStateNormal];
+        
+    }
+    else {
+        self.enterButton.userInteractionEnabled = NO;
+        [self.enterButton setBackgroundImage:[UIImage imageNamed:@"login_unable"] forState:UIControlStateNormal];
+    }
+}
 
 - (void)layoutSubviews {
     [super layoutSubviews];

+ 6 - 5
MusicGradeExam/MusicGradeExam/UI/Login/View/FSBodyView.xib

@@ -44,7 +44,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O9Q-A6-oFC">
                             <rect key="frame" x="0.0" y="0.0" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="UmM-J0-at4"/>
                             </constraints>
@@ -73,7 +73,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rt4-9E-2kW">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="XQe-OF-GaL"/>
                             </constraints>
@@ -102,7 +102,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gxb-eV-Ffr">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="u2m-an-Kax"/>
                             </constraints>
@@ -132,7 +132,7 @@
                         <constraint firstAttribute="width" constant="50" id="Vt1-IE-24P"/>
                         <constraint firstAttribute="height" constant="50" id="yxO-oC-mZd"/>
                     </constraints>
-                    <state key="normal" image="login_enter"/>
+                    <state key="normal" backgroundImage="login_unable"/>
                     <connections>
                         <action selector="sureAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="6aZ-Oh-Edc"/>
                     </connections>
@@ -164,6 +164,7 @@
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="bgView" destination="Eb2-M3-9Y1" id="CDm-av-gTm"/>
+                <outlet property="enterButton" destination="Efc-Ou-aRt" id="KC0-eR-1k3"/>
                 <outlet property="nameField" destination="wV2-Ip-Geb" id="WQa-7R-wbf"/>
                 <outlet property="passwordField" destination="p0w-Ca-Hnx" id="oSq-4e-e7S"/>
                 <outlet property="sPasswordField" destination="lIw-Or-DoE" id="D59-ld-Msg"/>
@@ -172,7 +173,7 @@
         </view>
     </objects>
     <resources>
-        <image name="login_enter" width="50" height="50"/>
         <image name="login_logo" width="170" height="48"/>
+        <image name="login_unable" width="50" height="50"/>
     </resources>
 </document>

+ 22 - 3
MusicGradeExam/MusicGradeExam/UI/Login/View/LoginBodyView.m

@@ -18,6 +18,8 @@
 
 @property (nonatomic, strong) CAGradientLayer *gradientLayer;
 
+@property (weak, nonatomic) IBOutlet UIButton *enterButton;
+
 @end
 
 @implementation LoginBodyView
@@ -26,15 +28,14 @@
     [super awakeFromNib];
     self.phoneField.delegate = self;
     self.phoneField.tintColor = self.phoneField.textColor;
-    self.phoneField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入手机号" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.phoneField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入手机号" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     self.passwordField.delegate = self;
     self.passwordField.tintColor = self.passwordField.textColor;
-    self.passwordField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入密码" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.passwordField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入密码" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     if (@available(iOS 10.0, *)) {
         _passwordField.textContentType = UITextContentTypeName;
     }
-//    self.forgetButton.hidden = YES;
     self.backButtonImage.hidden = YES;
     self.backButton.hidden = YES;
     [self.bgView.layer addSublayer:self.gradientLayer];
@@ -64,6 +65,7 @@
     if (callback) {
         self.callback = callback;
     }
+    [self checkEnterButtonStatus];
 }
 
 - (IBAction)backAction:(id)sender {
@@ -128,6 +130,23 @@
     return YES;
 }
 
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    // 判断
+    [self checkEnterButtonStatus];
+}
+
+- (void)checkEnterButtonStatus {
+    if (![NSString isEmptyString:_phoneField.text] &&![NSString isEmptyString:_passwordField.text]) {
+        self.enterButton.userInteractionEnabled = YES;
+        [self.enterButton setBackgroundImage:[UIImage imageNamed:@"login_enter"] forState:UIControlStateNormal];
+        
+    }
+    else {
+        self.enterButton.userInteractionEnabled = NO;
+        [self.enterButton setBackgroundImage:[UIImage imageNamed:@"login_unable"] forState:UIControlStateNormal];
+    }
+}
+
 
 - (CAGradientLayer *)gradientLayer {
     if (!_gradientLayer) {

+ 5 - 4
MusicGradeExam/MusicGradeExam/UI/Login/View/LoginBodyView.xib

@@ -61,7 +61,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VNg-tz-Fue">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="dKm-Hy-qFc"/>
                             </constraints>
@@ -90,7 +90,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fBJ-KD-iuK">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="MB2-c7-2fz"/>
                             </constraints>
@@ -120,7 +120,7 @@
                         <constraint firstAttribute="width" constant="50" id="L3A-Wr-fR4"/>
                         <constraint firstAttribute="height" constant="50" id="OD0-Cr-3dV"/>
                     </constraints>
-                    <state key="normal" image="login_enter"/>
+                    <state key="normal" backgroundImage="login_unable"/>
                     <connections>
                         <action selector="buttonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="y7W-dS-7zZ"/>
                     </connections>
@@ -178,6 +178,7 @@
                 <outlet property="backButton" destination="Fj5-gb-lcn" id="W6O-Gn-mgI"/>
                 <outlet property="backButtonImage" destination="XLo-v0-MR2" id="tNs-5B-gAt"/>
                 <outlet property="bgView" destination="uyt-ih-0IW" id="g2F-z6-gYd"/>
+                <outlet property="enterButton" destination="gMg-ta-wey" id="Dgw-Ck-drI"/>
                 <outlet property="forgetButton" destination="cI2-Yc-Rji" id="Mgk-mZ-eC6"/>
                 <outlet property="passwordField" destination="kpb-g6-Vcb" id="OPO-sJ-HGl"/>
                 <outlet property="phoneField" destination="LIz-1T-Wf4" id="EHD-eb-LEh"/>
@@ -187,7 +188,7 @@
     </objects>
     <resources>
         <image name="login_back" width="12" height="21"/>
-        <image name="login_enter" width="50" height="50"/>
         <image name="login_logo" width="170" height="48"/>
+        <image name="login_unable" width="50" height="50"/>
     </resources>
 </document>

+ 1 - 1
MusicGradeExam/MusicGradeExam/UI/Login/View/ModifyBodyView.xib

@@ -125,6 +125,6 @@
         </view>
     </objects>
     <resources>
-        <image name="button_nomal" width="340" height="49"/>
+        <image name="button_nomal" width="49.5" height="49"/>
     </resources>
 </document>

+ 19 - 2
MusicGradeExam/MusicGradeExam/UI/Login/View/RegisterBodyView.m

@@ -26,11 +26,11 @@
     [super awakeFromNib];
     self.phoneField.delegate = self;
     self.phoneField.tintColor = self.phoneField.textColor;
-    self.phoneField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入手机号" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.phoneField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入手机号" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     self.vefiCodeField.delegate = self;
     self.vefiCodeField.tintColor = self.vefiCodeField.textColor;
-    self.vefiCodeField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入验证码" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.vefiCodeField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入验证码" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     [self.bgView.layer addSublayer:self.gradientLayer];
     self.bgView.layer.masksToBounds = YES;
@@ -111,6 +111,23 @@
     return YES;
 }
 
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    // 判断
+    [self checkEnterButtonStatus];
+}
+
+- (void)checkEnterButtonStatus {
+    if (![NSString isEmptyString:_phoneField.text] &&![NSString isEmptyString:_vefiCodeField.text]) {
+        self.sureButton.userInteractionEnabled = YES;
+        [self.sureButton setBackgroundImage:[UIImage imageNamed:@"login_enter"] forState:UIControlStateNormal];
+        
+    }
+    else {
+        self.sureButton.userInteractionEnabled = NO;
+        [self.sureButton setBackgroundImage:[UIImage imageNamed:@"login_unable"] forState:UIControlStateNormal];
+    }
+}
+
 - (CAGradientLayer *)gradientLayer {
     if (!_gradientLayer) {
         _gradientLayer = [CAGradientLayer layer];

+ 4 - 4
MusicGradeExam/MusicGradeExam/UI/Login/View/RegisterBodyView.xib

@@ -31,7 +31,7 @@
                         <constraint firstAttribute="height" constant="50" id="1nl-Su-RAT"/>
                         <constraint firstAttribute="width" constant="50" id="oJm-d4-kgn"/>
                     </constraints>
-                    <state key="normal" image="login_enter"/>
+                    <state key="normal" backgroundImage="login_unable"/>
                     <connections>
                         <action selector="buttonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="WTl-P7-Fxt"/>
                     </connections>
@@ -58,7 +58,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f3I-sY-jdw">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="dq2-Ea-zPl"/>
                             </constraints>
@@ -108,7 +108,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yyQ-pZ-sen">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="JmA-jk-2ZP"/>
                             </constraints>
@@ -179,7 +179,7 @@
     </objects>
     <resources>
         <image name="login_back" width="12" height="21"/>
-        <image name="login_enter" width="50" height="50"/>
         <image name="login_logo" width="170" height="48"/>
+        <image name="login_unable" width="50" height="50"/>
     </resources>
 </document>

+ 20 - 3
MusicGradeExam/MusicGradeExam/UI/Login/View/VefiBodyView.m

@@ -13,7 +13,7 @@
 @property (weak, nonatomic) IBOutlet UIImageView *backButtonImage;
 @property (weak, nonatomic) IBOutlet UIButton *backButton;
 @property (weak, nonatomic) IBOutlet UITextField *vefiCodeField;
-@property (weak, nonatomic) IBOutlet UIButton *sureButton;
+@property (weak, nonatomic) IBOutlet UIButton *enterButton;
 
 @property (weak, nonatomic) IBOutlet UIView *bgView;
 
@@ -28,11 +28,11 @@
     [super awakeFromNib];
     self.phoneField.delegate = self;
     self.phoneField.tintColor = self.phoneField.textColor;
-    self.phoneField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入手机号" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.phoneField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入手机号" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     self.vefiCodeField.delegate = self;
     self.vefiCodeField.tintColor = self.vefiCodeField.textColor;
-    self.vefiCodeField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入验证码" attributes:@{NSForegroundColorAttributeName:HexRGB(0xffffff), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
+    self.vefiCodeField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入验证码" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0xffffff, 0.73), NSFontAttributeName:[UIFont systemFontOfSize:18.0]}];
     
     [self.bgView.layer addSublayer:self.gradientLayer];
     self.bgView.layer.masksToBounds = YES;
@@ -116,6 +116,23 @@
     return YES;
 }
 
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    // 判断
+    [self checkEnterButtonStatus];
+}
+
+- (void)checkEnterButtonStatus {
+    if (![NSString isEmptyString:_phoneField.text] &&![NSString isEmptyString:_vefiCodeField.text]) {
+        self.enterButton.userInteractionEnabled = YES;
+        [self.enterButton setBackgroundImage:[UIImage imageNamed:@"login_enter"] forState:UIControlStateNormal];
+        
+    }
+    else {
+        self.enterButton.userInteractionEnabled = NO;
+        [self.enterButton setBackgroundImage:[UIImage imageNamed:@"login_unable"] forState:UIControlStateNormal];
+    }
+}
+
 - (CAGradientLayer *)gradientLayer {
     if (!_gradientLayer) {
         _gradientLayer = [CAGradientLayer layer];

+ 6 - 6
MusicGradeExam/MusicGradeExam/UI/Login/View/VefiBodyView.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"/>
@@ -61,7 +61,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mcl-w2-mHu">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="gvv-Qm-2jB"/>
                             </constraints>
@@ -90,7 +90,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bye-dC-hy8">
                             <rect key="frame" x="0.0" y="59" width="334" height="1"/>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="a0S-OU-4LZ"/>
                             </constraints>
@@ -141,7 +141,7 @@
                         <constraint firstAttribute="width" constant="50" id="2aw-Us-wiw"/>
                         <constraint firstAttribute="height" constant="50" id="PtY-RH-A1x"/>
                     </constraints>
-                    <state key="normal" image="login_enter"/>
+                    <state key="normal" backgroundImage="login_unable"/>
                     <connections>
                         <action selector="buttonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="fi5-Mw-ags"/>
                     </connections>
@@ -178,8 +178,8 @@
                 <outlet property="backButtonImage" destination="h2l-4E-sE8" id="fuR-Jn-PBz"/>
                 <outlet property="bgView" destination="URI-l2-0jz" id="VIK-KP-IlR"/>
                 <outlet property="codeButton" destination="yjO-5o-ZEt" id="RjK-Sm-SNh"/>
+                <outlet property="enterButton" destination="OKW-Vv-YZN" id="ufg-bl-aKK"/>
                 <outlet property="phoneField" destination="r3s-TW-HFH" id="skA-GU-LTJ"/>
-                <outlet property="sureButton" destination="OKW-Vv-YZN" id="5i2-18-Inc"/>
                 <outlet property="vefiCodeField" destination="1UN-oO-xQs" id="aDZ-48-nQ4"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="101.78571428571428"/>
@@ -187,7 +187,7 @@
     </objects>
     <resources>
         <image name="login_back" width="12" height="21"/>
-        <image name="login_enter" width="50" height="50"/>
         <image name="login_logo" width="170" height="48"/>
+        <image name="login_unable" width="50" height="50"/>
     </resources>
 </document>