Parcourir la source

个人信息设置业务逻辑暂时提交

yanxuyao il y a 2 ans
Parent
commit
06aa034ee3

BIN
MiMoLive/MiMoLive.xcworkspace/xcuserdata/yanxuyao.xcuserdatad/UserInterfaceState.xcuserstate


+ 21 - 0
MiMoLive/MiMoLive/Assets.xcassets/Login/icon_man_select.imageset/Contents.json

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

BIN
MiMoLive/MiMoLive/Assets.xcassets/Login/icon_man_select.imageset/icon_man_select@2x.png


+ 21 - 0
MiMoLive/MiMoLive/Assets.xcassets/Login/icon_woman_no_select.imageset/Contents.json

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

BIN
MiMoLive/MiMoLive/Assets.xcassets/Login/icon_woman_no_select.imageset/icon_woman_no_select@2x.png


+ 24 - 0
MiMoLive/MiMoLive/Classes/Welcome/MOFirstInfoSetVC.m

@@ -11,6 +11,12 @@
 
 
 @property (weak, nonatomic) IBOutlet UIButton *skipBtn;
 @property (weak, nonatomic) IBOutlet UIButton *skipBtn;
 
 
+@property (weak, nonatomic) IBOutlet UIButton *headBtn;
+
+@property (weak, nonatomic) IBOutlet UIButton *manBtn;
+@property (weak, nonatomic) IBOutlet UIButton *womanBtn;
+
+
 @property (weak, nonatomic) IBOutlet UITextField *nameTef;
 @property (weak, nonatomic) IBOutlet UITextField *nameTef;
 
 
 @property (weak, nonatomic) IBOutlet UIButton *doneBtn;
 @property (weak, nonatomic) IBOutlet UIButton *doneBtn;
@@ -30,6 +36,9 @@
     self.skipBtn.layer.cornerRadius = 22.0 / 2.0;
     self.skipBtn.layer.cornerRadius = 22.0 / 2.0;
     self.skipBtn.layer.masksToBounds = YES;
     self.skipBtn.layer.masksToBounds = YES;
     
     
+    [self.manBtn setImage:[UIImage imageNamed:@"icon_man_select"] forState:UIControlStateSelected];
+    [self.womanBtn setImage:[UIImage imageNamed:@"icon_woman_no_select"] forState:UIControlStateNormal];
+    
     self.nameTef.layer.cornerRadius = 60.0 / 2;
     self.nameTef.layer.cornerRadius = 60.0 / 2;
     self.nameTef.layer.masksToBounds = YES;
     self.nameTef.layer.masksToBounds = YES;
     
     
@@ -50,6 +59,21 @@
     
     
 }
 }
 
 
+- (IBAction)manBtnClick:(id)sender {
+    self.manBtn.backgroundColor = [MOTools colorWithHexString:@"#748FF3" alpha:1.0];
+    self.womanBtn.backgroundColor = [MOTools colorWithHexString:@"#FFFFFF" alpha:1.0];
+    self.manBtn.selected = YES;
+    self.womanBtn.selected = NO;
+}
+
+- (IBAction)womanBtnClick:(id)sender {
+    self.manBtn.backgroundColor = [MOTools colorWithHexString:@"#FFFFFF" alpha:1.0];
+    self.womanBtn.backgroundColor = [MOTools colorWithHexString:@"#748FF3" alpha:1.0];
+    self.manBtn.selected = NO;
+    self.womanBtn.selected = YES;
+}
+
+
 ///下一步按钮点击
 ///下一步按钮点击
 - (IBAction)nextStepClick:(id)sender {
 - (IBAction)nextStepClick:(id)sender {
     
     

+ 41 - 3
MiMoLive/MiMoLive/Classes/Welcome/MOFirstInfoSetVC.xib

@@ -11,9 +11,12 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MOFirstInfoSetVC">
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MOFirstInfoSetVC">
             <connections>
             <connections>
                 <outlet property="doneBtn" destination="oRN-GB-QkV" id="RnF-XX-Vye"/>
                 <outlet property="doneBtn" destination="oRN-GB-QkV" id="RnF-XX-Vye"/>
+                <outlet property="headBtn" destination="O9j-1X-lmL" id="pUM-tQ-1l8"/>
+                <outlet property="manBtn" destination="XVy-UC-DMq" id="EkN-2D-E1n"/>
                 <outlet property="nameTef" destination="0OW-6M-n6b" id="iDR-yQ-0dY"/>
                 <outlet property="nameTef" destination="0OW-6M-n6b" id="iDR-yQ-0dY"/>
                 <outlet property="skipBtn" destination="fgF-hO-hOS" id="ILd-7M-Kfj"/>
                 <outlet property="skipBtn" destination="fgF-hO-hOS" id="ILd-7M-Kfj"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outlet property="womanBtn" destination="nDK-Lk-ij3" id="eVO-X4-upX"/>
             </connections>
             </connections>
         </placeholder>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -81,8 +84,38 @@
                         <action selector="headBtnClick:" destination="-1" eventType="touchUpInside" id="dwj-XN-SpE"/>
                         <action selector="headBtnClick:" destination="-1" eventType="touchUpInside" id="dwj-XN-SpE"/>
                     </connections>
                     </connections>
                 </button>
                 </button>
+                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="WG0-rz-6cD">
+                    <rect key="frame" x="20" y="352" width="374" height="48"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XVy-UC-DMq">
+                            <rect key="frame" x="0.0" y="0.0" width="187" height="48"/>
+                            <color key="backgroundColor" red="0.45490196078431372" green="0.5607843137254902" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="Male" image="icon_man_select">
+                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </state>
+                            <connections>
+                                <action selector="manBtnClick:" destination="-1" eventType="touchUpInside" id="DFh-gY-ZuQ"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nDK-Lk-ij3">
+                            <rect key="frame" x="187" y="0.0" width="187" height="48"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="Female" image="icon_woman_no_select">
+                                <color key="titleColor" red="0.87058823529411766" green="0.83529411764705885" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="womanBtnClick:" destination="-1" eventType="touchUpInside" id="GYy-EW-Wzz"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="48" id="Yvh-f9-xwL"/>
+                    </constraints>
+                </stackView>
                 <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Nickname" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0OW-6M-n6b">
                 <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Nickname" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0OW-6M-n6b">
-                    <rect key="frame" x="9" y="345" width="396" height="60"/>
+                    <rect key="frame" x="9" y="419" width="396" height="60"/>
                     <constraints>
                     <constraints>
                         <constraint firstAttribute="height" constant="60" id="ilB-SM-suW"/>
                         <constraint firstAttribute="height" constant="60" id="ilB-SM-suW"/>
                     </constraints>
                     </constraints>
@@ -114,13 +147,16 @@
                 <constraint firstAttribute="trailing" secondItem="oRN-GB-QkV" secondAttribute="trailing" constant="36" id="CGn-aY-MZr"/>
                 <constraint firstAttribute="trailing" secondItem="oRN-GB-QkV" secondAttribute="trailing" constant="36" id="CGn-aY-MZr"/>
                 <constraint firstItem="O9j-1X-lmL" firstAttribute="top" secondItem="v7x-1E-JXl" secondAttribute="bottom" constant="19" id="DoF-Jk-1d9"/>
                 <constraint firstItem="O9j-1X-lmL" firstAttribute="top" secondItem="v7x-1E-JXl" secondAttribute="bottom" constant="19" id="DoF-Jk-1d9"/>
                 <constraint firstAttribute="bottom" secondItem="AIh-Uc-z2O" secondAttribute="bottom" id="OBK-eV-6Sq"/>
                 <constraint firstAttribute="bottom" secondItem="AIh-Uc-z2O" secondAttribute="bottom" id="OBK-eV-6Sq"/>
+                <constraint firstAttribute="trailing" secondItem="WG0-rz-6cD" secondAttribute="trailing" constant="20" id="Sgr-OY-Owq"/>
                 <constraint firstItem="O9j-1X-lmL" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Suw-Ff-vHT"/>
                 <constraint firstItem="O9j-1X-lmL" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Suw-Ff-vHT"/>
                 <constraint firstItem="w29-6N-gXz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="TUn-8I-16D"/>
                 <constraint firstItem="w29-6N-gXz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="TUn-8I-16D"/>
+                <constraint firstItem="WG0-rz-6cD" firstAttribute="top" secondItem="O9j-1X-lmL" secondAttribute="bottom" constant="37" id="Uis-Xh-F8T"/>
                 <constraint firstItem="oRN-GB-QkV" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="36" id="Xyd-ea-xj9"/>
                 <constraint firstItem="oRN-GB-QkV" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="36" id="Xyd-ea-xj9"/>
                 <constraint firstItem="bzj-58-dmK" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="beA-V5-iiI"/>
                 <constraint firstItem="bzj-58-dmK" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="beA-V5-iiI"/>
                 <constraint firstAttribute="trailing" secondItem="0OW-6M-n6b" secondAttribute="trailing" constant="9" id="cML-HS-fSf"/>
                 <constraint firstAttribute="trailing" secondItem="0OW-6M-n6b" secondAttribute="trailing" constant="9" id="cML-HS-fSf"/>
+                <constraint firstItem="WG0-rz-6cD" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="20" id="ecF-VP-ajX"/>
                 <constraint firstItem="w29-6N-gXz" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="106" id="erH-Xk-eRA"/>
                 <constraint firstItem="w29-6N-gXz" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="106" id="erH-Xk-eRA"/>
-                <constraint firstItem="0OW-6M-n6b" firstAttribute="top" secondItem="O9j-1X-lmL" secondAttribute="bottom" constant="30" id="fNa-VP-AmO"/>
+                <constraint firstItem="0OW-6M-n6b" firstAttribute="top" secondItem="O9j-1X-lmL" secondAttribute="bottom" constant="104" id="fNa-VP-AmO"/>
                 <constraint firstItem="fgF-hO-hOS" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="60" id="fX5-B6-jKM"/>
                 <constraint firstItem="fgF-hO-hOS" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="60" id="fX5-B6-jKM"/>
                 <constraint firstItem="AIh-Uc-z2O" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="gX2-y5-VkE"/>
                 <constraint firstItem="AIh-Uc-z2O" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="gX2-y5-VkE"/>
                 <constraint firstAttribute="trailing" secondItem="fgF-hO-hOS" secondAttribute="trailing" constant="16" id="o7E-wy-Jm4"/>
                 <constraint firstAttribute="trailing" secondItem="fgF-hO-hOS" secondAttribute="trailing" constant="16" id="o7E-wy-Jm4"/>
@@ -128,11 +164,13 @@
                 <constraint firstItem="0OW-6M-n6b" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="9" id="w6v-Av-Q5I"/>
                 <constraint firstItem="0OW-6M-n6b" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="9" id="w6v-Av-Q5I"/>
                 <constraint firstAttribute="trailing" secondItem="AIh-Uc-z2O" secondAttribute="trailing" id="yZh-dL-9H9"/>
                 <constraint firstAttribute="trailing" secondItem="AIh-Uc-z2O" secondAttribute="trailing" id="yZh-dL-9H9"/>
             </constraints>
             </constraints>
-            <point key="canvasLocation" x="-6" y="3"/>
+            <point key="canvasLocation" x="-7.2463768115942031" y="2.6785714285714284"/>
         </view>
         </view>
     </objects>
     </objects>
     <resources>
     <resources>
         <image name="icon_language" width="281.5" height="609"/>
         <image name="icon_language" width="281.5" height="609"/>
+        <image name="icon_man_select" width="23.5" height="23.5"/>
+        <image name="icon_woman_no_select" width="23.5" height="23.5"/>
         <systemColor name="systemBackgroundColor">
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         </systemColor>