创建账号

artimenring-iOS/Artimenring/Base.lproj/Main.storyboard

@@ -3045,13 +3045,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="1Zt-gJ-hX6">
                                                             <rect key="frame" x="13.666666666666657" y="20" width="43" height="20.333333333333329"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="+1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TAP-5H-Ccd">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TAP-5H-Ccd">
                                                                     <rect key="frame" x="0.0" y="0.0" width="18" height="20.333333333333332"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                     <color key="textColor" red="0.0" green="0.0039215686269999999" blue="0.29411764709999999" alpha="0.5963716443" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="login_pulldown" translatesAutoresizingMaskIntoConstraints="NO" id="FFv-2R-rlF">
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_pulldown" translatesAutoresizingMaskIntoConstraints="NO" id="FFv-2R-rlF">
                                                                     <rect key="frame" x="23" y="0.0" width="20" height="20.333333333333332"/>
                                                                 </imageView>
                                                             </subviews>
@@ -7926,6 +7926,9 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="account_bg" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l9Y-A7-Wpb">
+                                <rect key="frame" x="0.0" y="-25" width="375" height="843"/>
+                            </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kido_icon" translatesAutoresizingMaskIntoConstraints="NO" id="qhr-Ih-ZSG">
                                 <rect key="frame" x="81.000000000000014" y="150" width="213.33333333333337" height="38.333333333333343"/>
                             </imageView>
@@ -8260,14 +8263,18 @@
                         <viewLayoutGuide key="safeArea" id="dW4-uC-CZs"/>
                         <color key="backgroundColor" red="0.97647058819999999" green="0.97647058819999999" blue="0.98823529409999999" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
+                            <constraint firstItem="l9Y-A7-Wpb" firstAttribute="leading" secondItem="dW4-uC-CZs" secondAttribute="leading" id="CiG-Cx-GTu"/>
                             <constraint firstItem="wbd-7B-AwC" firstAttribute="leading" secondItem="dW4-uC-CZs" secondAttribute="leading" id="DrL-P0-J6c"/>
                             <constraint firstItem="dW4-uC-CZs" firstAttribute="bottom" secondItem="RW0-i6-9cY" secondAttribute="bottom" constant="-40" id="Efx-8k-3OB"/>
                             <constraint firstItem="qhr-Ih-ZSG" firstAttribute="top" secondItem="dW4-uC-CZs" secondAttribute="top" constant="100" id="FK6-zg-ENY"/>
+                            <constraint firstItem="dW4-uC-CZs" firstAttribute="trailing" secondItem="l9Y-A7-Wpb" secondAttribute="trailing" id="IOh-20-Gfe"/>
+                            <constraint firstItem="l9Y-A7-Wpb" firstAttribute="top" secondItem="dW4-uC-CZs" secondAttribute="top" constant="-75" id="KAY-Yo-2kX"/>
                             <constraint firstItem="dW4-uC-CZs" firstAttribute="trailing" secondItem="YTt-il-rG4" secondAttribute="trailing" constant="15" id="N3v-Tz-cDN"/>
                             <constraint firstItem="RW0-i6-9cY" firstAttribute="top" secondItem="dW4-uC-CZs" secondAttribute="top" constant="-75" id="aS1-LN-KYi"/>
                             <constraint firstItem="YTt-il-rG4" firstAttribute="leading" secondItem="dW4-uC-CZs" secondAttribute="leading" constant="15" id="bq8-4h-dxa"/>
                             <constraint firstItem="qhr-Ih-ZSG" firstAttribute="centerX" secondItem="dW4-uC-CZs" secondAttribute="centerX" id="cBV-JW-QU2"/>
                             <constraint firstItem="RW0-i6-9cY" firstAttribute="leading" secondItem="dW4-uC-CZs" secondAttribute="leading" id="cIy-R6-ow6"/>
+                            <constraint firstItem="dW4-uC-CZs" firstAttribute="bottom" secondItem="l9Y-A7-Wpb" secondAttribute="bottom" constant="-40" id="fO3-og-pqo"/>
                             <constraint firstItem="dW4-uC-CZs" firstAttribute="bottom" secondItem="wbd-7B-AwC" secondAttribute="bottom" id="fm8-ie-yZu"/>
                             <constraint firstItem="dW4-uC-CZs" firstAttribute="trailing" secondItem="RW0-i6-9cY" secondAttribute="trailing" id="nEy-ph-mP2"/>
                             <constraint firstItem="dW4-uC-CZs" firstAttribute="trailing" secondItem="wbd-7B-AwC" secondAttribute="trailing" id="oH7-n3-6hs"/>
@@ -8472,11 +8479,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="account_bg" translatesAutoresizingMaskIntoConstraints="NO" id="wB8-gM-gf1">
+                                <rect key="frame" x="0.0" y="-55" width="375" height="873"/>
+                            </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="i3b-BV-Toq">
-                                <rect key="frame" x="15" y="80" width="345" height="48"/>
+                                <rect key="frame" x="15" y="140" width="345" height="94"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your password must be 6-16 digits of numbers and letters" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u3b-hC-AoA">
-                                        <rect key="frame" x="0.0" y="0.0" width="345" height="48"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="创建账号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zqh-59-6uf">
+                                        <rect key="frame" x="0.0" y="0.0" width="345" height="36"/>
+                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="30"/>
+                                        <color key="textColor" red="0.21568627450980393" green="0.32941176470588235" blue="0.46666666666666667" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your password must be 6-16 digits of numbers and letters" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gP-Oa-LH6">
+                                        <rect key="frame" x="0.0" y="46" width="345" height="48"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                         <color key="textColor" red="0.0" green="0.0039215686269999999" blue="0.29411764709999999" alpha="0.60268980699999997" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -8484,7 +8500,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-Q3-6uc">
-                                <rect key="frame" x="15" y="168" width="345" height="312"/>
+                                <rect key="frame" x="15" y="274" width="345" height="312"/>
                                 <subviews>
                                     <view hidden="YES" tag="100" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kBH-sf-zKb">
                                         <rect key="frame" x="0.0" y="-54" width="345" height="54"/>
@@ -8493,7 +8509,7 @@
                                                 <rect key="frame" x="15" y="16" width="22" height="22"/>
                                             </imageView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hbQ-YS-zgd">
-                                                <rect key="frame" x="47" y="-0.6666666666666714" width="75" height="54.666666666666664"/>
+                                                <rect key="frame" x="47" y="-0.66666666666665719" width="75" height="54.666666666666664"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CeS-2k-Hxh">
                                                         <rect key="frame" x="0.0" y="0.0" width="75" height="54.666666666666664"/>
@@ -8502,13 +8518,13 @@
                                                         </connections>
                                                     </button>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VQk-AB-fi8">
-                                                        <rect key="frame" x="0.0" y="17.333333333333329" width="18" height="20.333333333333329"/>
+                                                        <rect key="frame" x="0.0" y="17.333333333333314" width="18" height="20.333333333333329"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                         <color key="textColor" red="0.0" green="0.0039215686269999999" blue="0.29411764709999999" alpha="0.5963716443" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_pulldown" translatesAutoresizingMaskIntoConstraints="NO" id="TMi-jz-Lbm">
-                                                        <rect key="frame" x="23" y="15.333333333333329" width="20" height="20"/>
+                                                        <rect key="frame" x="23" y="15.333333333333314" width="20" height="20"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="20" id="Ud9-gR-kB5"/>
                                                             <constraint firstAttribute="height" constant="20" id="w1k-3B-A5D"/>
@@ -8772,12 +8788,16 @@
                         <constraints>
                             <constraint firstItem="j0A-Q3-6uc" firstAttribute="leading" secondItem="beJ-hk-KQ7" secondAttribute="leading" constant="15" id="0kO-Xr-E2B"/>
                             <constraint firstItem="beJ-hk-KQ7" firstAttribute="trailing" secondItem="i3b-BV-Toq" secondAttribute="trailing" constant="15" id="4v0-gR-6MM"/>
-                            <constraint firstItem="i3b-BV-Toq" firstAttribute="top" secondItem="beJ-hk-KQ7" secondAttribute="top" constant="30" id="E57-m3-xLx"/>
+                            <constraint firstItem="i3b-BV-Toq" firstAttribute="top" secondItem="beJ-hk-KQ7" secondAttribute="top" constant="90" id="E57-m3-xLx"/>
                             <constraint firstItem="i3b-BV-Toq" firstAttribute="leading" secondItem="beJ-hk-KQ7" secondAttribute="leading" constant="15" id="Hzc-4t-e4k"/>
+                            <constraint firstItem="beJ-hk-KQ7" firstAttribute="bottom" secondItem="wB8-gM-gf1" secondAttribute="bottom" constant="-40" id="KVw-iJ-ZBe"/>
+                            <constraint firstItem="beJ-hk-KQ7" firstAttribute="trailing" secondItem="wB8-gM-gf1" secondAttribute="trailing" id="P73-RH-Les"/>
                             <constraint firstItem="beJ-hk-KQ7" firstAttribute="bottom" secondItem="ApN-Nv-93X" secondAttribute="bottom" id="RCt-y2-4PL"/>
                             <constraint firstItem="j0A-Q3-6uc" firstAttribute="top" secondItem="i3b-BV-Toq" secondAttribute="bottom" constant="40" id="dwX-ky-kig"/>
                             <constraint firstItem="beJ-hk-KQ7" firstAttribute="trailing" secondItem="j0A-Q3-6uc" secondAttribute="trailing" constant="15" id="fLV-ap-EsM"/>
                             <constraint firstItem="ApN-Nv-93X" firstAttribute="leading" secondItem="beJ-hk-KQ7" secondAttribute="leading" id="feL-3x-0Ev"/>
+                            <constraint firstItem="wB8-gM-gf1" firstAttribute="leading" secondItem="beJ-hk-KQ7" secondAttribute="leading" id="oLI-HJ-CjK"/>
+                            <constraint firstItem="wB8-gM-gf1" firstAttribute="top" secondItem="beJ-hk-KQ7" secondAttribute="top" constant="-105" id="uuq-LG-L0o"/>
                             <constraint firstItem="beJ-hk-KQ7" firstAttribute="trailing" secondItem="ApN-Nv-93X" secondAttribute="trailing" id="xYg-Zo-NqV"/>
                         </constraints>
                     </view>
@@ -9810,6 +9830,7 @@ If you still can't scan the code properly after inserting it correctly, please s
     <resources>
         <image name="Keep calling selected.png" width="62" height="62"/>
         <image name="Keep calling.png" width="62" height="62"/>
+        <image name="account_bg" width="390" height="844"/>
         <image name="answer.png" width="74" height="74"/>
         <image name="avatar" width="60" height="60"/>
         <image name="baby_bind" width="12" height="12"/>
@@ -9890,7 +9911,7 @@ If you still can't scan the code properly after inserting it correctly, please s
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemGray4Color">
-            <color red="0.81960784310000001" green="0.81960784310000001" blue="0.83921568629999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.81960784313725488" green="0.81960784313725488" blue="0.83921568627450982" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

artimenring-iOS/Artimenring/Classes/ViewController/Base/SKBaseViewController+navigationbar.h

@@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)addNavigationView;
 
+- (void)addBackButton;
+
 - (void)addMoreButtons;
 - (void)refreshMoreButtons:(BOOL)status;
 

artimenring-iOS/Artimenring/Classes/ViewController/Base/SKBaseViewController+navigationbar.m

@@ -17,6 +17,21 @@
     [self.view addSubview:self.mNavigationView];
 }
 
+- (void)addBackButton {
+    float x = 20;
+    float y = SCREEN_NAVIGATION_HEIGHT;
+    float w = 40;
+    float h = 40;
+    UIButton* backButton = [[UIButton alloc] initWithFrame:CGRectMake(x, y, w, h)];
+    [backButton setImage:[UIImage imageNamed:@"btn_back"] forState:UIControlStateNormal];
+    [backButton addTarget:self action:@selector(onBackButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:backButton];
+}
+
+- (void)onBackButtonClick:(id)sender {
+    [self popViewController:sender];
+}
+
 - (void)addMoreButtons {
     BOOL isNewNotification = [DataManager shared].isNewNotification;
     [self addMoreButtonEx:isNewNotification];

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKRegisterViewController.m

@@ -15,12 +15,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    [self.navigationController setNavigationBarHidden:NO];
-    if (@available(iOS 11.0, *)) {
-        [self.navigationItem setLargeTitleDisplayMode:UINavigationItemLargeTitleDisplayModeAlways];
-        self.edgesForExtendedLayout = UIRectEdgeAll;
-    }
-    [self setNavigationBarColor:1];
+    
+    //[self addBackButton];
     
     [self setAgree:NO];
     [self.agreeBtn setSelected:NO];
@@ -31,6 +27,11 @@
     [self autoAccount];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO];
+}
+
 - (void)initView {
     NSString* s0 = NSLocalizedString(@"Login.Read.Agree.0", nil);
     NSString* s1 = NSLocalizedString(@"Login.Read.Agree.1", nil);
@@ -50,17 +51,6 @@
 #endif
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:NO];
-    self.title = NSLocalizedString(@"Register.Account", nil);
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    self.title = @"";
-}
-
 - (IBAction)confirmAction:(id)sender{
     [[UIApplication sharedApplication].keyWindow endEditing:YES];
     if ([self checkAccount] == NO)

artimenring-iOS/Artimenring/Images.xcassets/Login/account_bg.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Main/btn_back.imageset/Contents.json

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

artimenring-iOS/Artimenring/zh-HK.lproj/Main.strings

@@ -160,7 +160,7 @@
 "gRl-hy-wwT.text" = "已添加";
 "gW0-Wc-EWv.normalTitle" = "刪除";
 "gax-xf-R3n.text" = "您的密碼必須是6-16位數字和字母組成";
-"gfY-XQ-D8f.text" = "Your password must be 6-16 digits of numbers and letters";
+"gfY-XQ-D8f.text" = "您的密碼必須是6-16位數字和字母組成";
 "h6h-vs-8ET.text" = "Label";
 "hOG-gx-BIr.text" = "對準手錶二維碼，即可掃描";
 "hkp-OK-YCI.text" = "Title";

artimenring-iOS/Artimenring/zh-Hans.lproj/Main.strings

@@ -160,7 +160,7 @@
 "gRl-hy-wwT.text" = "已添加";
 "gW0-Wc-EWv.normalTitle" = "删除";
 "gax-xf-R3n.text" = "您的密码必须是6-16位数字和字母组成";
-"gfY-XQ-D8f.text" = "Your password must be 6-16 digits of numbers and letters";
+"gfY-XQ-D8f.text" = "您的密码必须是6-16位数字和字母组成";
 "h6h-vs-8ET.text" = "Label";
 "hOG-gx-BIr.text" = "对准手表二维码，即可扫描";
 "hkp-OK-YCI.text" = "Title";