登录 gui

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

@@ -7929,11 +7929,29 @@
                             <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>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="88W-vo-xcy">
+                                <rect key="frame" x="0.0" y="150" width="375" height="105"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_app" translatesAutoresizingMaskIntoConstraints="NO" id="qhr-Ih-ZSG">
+                                        <rect key="frame" x="147.66666666666666" y="0.0" width="80" height="80"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="80" id="FXB-bQ-O0H"/>
+                                            <constraint firstAttribute="height" constant="80" id="QPz-bE-ryj"/>
+                                        </constraints>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SikeyComm" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksY-kx-hK0">
+                                        <rect key="frame" x="121.00000000000001" y="85" width="133.33333333333337" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="WtB-L6-LAQ"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="25"/>
+                                        <color key="textColor" red="0.21568627450980393" green="0.32941176470588235" blue="0.46666666666666667" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                            </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="YTt-il-rG4">
-                                <rect key="frame" x="15" y="243.33333333333337" width="345" height="312"/>
+                                <rect key="frame" x="15" y="310" width="345" height="312"/>
                                 <subviews>
                                     <view hidden="YES" tag="100" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NS4-tJ-2oc">
                                         <rect key="frame" x="0.0" y="-54" width="345" height="54"/>
@@ -7942,7 +7960,7 @@
                                                 <rect key="frame" x="15" y="16" width="22" height="22"/>
                                             </imageView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="664-d9-2iA">
-                                                <rect key="frame" x="47" y="-0.66666666666668561" 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="EM5-SQ-enD">
                                                         <rect key="frame" x="0.0" y="0.0" width="75" height="54.666666666666664"/>
@@ -8004,7 +8022,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="345" height="54"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_email" translatesAutoresizingMaskIntoConstraints="NO" id="5Dh-P5-3WX">
-                                                <rect key="frame" x="15" y="19.999999999999972" width="20" height="14"/>
+                                                <rect key="frame" x="15" y="20" width="20" height="14"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="20" id="iqy-KY-nZf"/>
                                                     <constraint firstAttribute="height" constant="14" id="nlK-ot-5us"/>
@@ -8031,7 +8049,7 @@
                                         </constraints>
                                     </view>
                                     <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YXu-wN-aNe">
-                                        <rect key="frame" x="0.0" y="63.999999999999972" width="345" height="54"/>
+                                        <rect key="frame" x="0.0" y="64" width="345" height="54"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_key" translatesAutoresizingMaskIntoConstraints="NO" id="Zim-Hj-HIp">
                                                 <rect key="frame" x="15" y="17" width="20" height="20"/>
@@ -8061,7 +8079,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YYm-cE-HGp">
-                                        <rect key="frame" x="0.0" y="127.99999999999997" width="345" height="54"/>
+                                        <rect key="frame" x="0.0" y="128" width="345" height="54"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xRe-Ae-gnJ">
                                                 <rect key="frame" x="10" y="10" width="62" height="22"/>
@@ -8100,7 +8118,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LSe-P8-eke">
-                                        <rect key="frame" x="0.0" y="191.99999999999997" width="345" height="120.00000000000003"/>
+                                        <rect key="frame" x="0.0" y="192" width="345" height="120"/>
                                         <subviews>
                                             <button opaque="NO" tag="110" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tsw-JI-KcG">
                                                 <rect key="frame" x="0.0" y="38" width="345" height="44"/>
@@ -8266,19 +8284,20 @@
                             <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="88W-vo-xcy" firstAttribute="leading" secondItem="dW4-uC-CZs" secondAttribute="leading" id="MGa-8f-txs"/>
                             <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="88W-vo-xcy" firstAttribute="top" secondItem="dW4-uC-CZs" secondAttribute="top" constant="100" id="ayH-CI-Gfy"/>
                             <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"/>
-                            <constraint firstItem="YTt-il-rG4" firstAttribute="top" secondItem="qhr-Ih-ZSG" secondAttribute="bottom" constant="55" id="xUN-LB-wXY"/>
+                            <constraint firstItem="YTt-il-rG4" firstAttribute="top" secondItem="88W-vo-xcy" secondAttribute="bottom" constant="55" id="rOS-fy-nLo"/>
+                            <constraint firstItem="dW4-uC-CZs" firstAttribute="trailing" secondItem="88W-vo-xcy" secondAttribute="trailing" id="zMn-91-jep"/>
                         </constraints>
                     </view>
                     <connections>
@@ -8297,7 +8316,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="bbw-nC-8p6" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1042" y="-3011"/>
+            <point key="canvasLocation" x="-1042.4000000000001" y="-3011.0837438423646"/>
         </scene>
         <!--Relation View Controller-->
         <scene sceneID="g4x-5K-tSW">
@@ -9868,6 +9887,7 @@ If you still can't scan the code properly after inserting it correctly, please s
         <image name="ic_signal_4" width="20" height="16"/>
         <image name="ic_watch_battery_border" width="20" height="14"/>
         <image name="icon_alarmclock" width="24" height="24"/>
+        <image name="icon_app" width="80" height="80"/>
         <image name="icon_email" width="18" height="14"/>
         <image name="icon_key" width="20" height="20"/>
         <image name="icon_location_cur" width="50" height="26"/>
@@ -9882,7 +9902,6 @@ If you still can't scan the code properly after inserting it correctly, please s
         <image name="k2_app_rightmenu_custom_normal" width="50" height="50"/>
         <image name="k2_app_rightmenu_sleep_normal" width="50" height="50"/>
         <image name="k2_app_rightmenu_time" width="30" height="30"/>
-        <image name="kido_icon" width="213.33332824707031" height="38.333332061767578"/>
         <image name="left_signal4" width="24" height="24"/>
         <image name="leftmenu_common" width="24" height="24"/>
         <image name="leftmenu_selected" width="24" height="24"/>

artimenring-iOS/Artimenring/Images.xcassets/Common/icon_app.imageset/Contents.json

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

artimenring-iOS/Artimenring/en.lproj/Main.strings

@@ -114,7 +114,7 @@
 "aH1-rs-hSC.text" = "Your phone number";
 "ajH-6y-apb.text" = "Please enter";
 "ale-C0-Un0.text" = "Name";
-"b2Y-cj-hIk.text" = "Please enter your email address and verification code.";
+"b2Y-cj-hIk.text" = "Please enter your account and verification code.";
 "bfy-hY-JzN.placeholder" = "Please enter the verification code";
 "bkE-Ws-P7R.segmentTitles[0]" = "Standard";
 "bkE-Ws-P7R.segmentTitles[1]" = "Satellite";

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

@@ -132,7 +132,7 @@
 "aO2-xQ-Gcm.text" = "Label";
 "ajH-6y-apb.text" = "請輸入";
 "ale-C0-Un0.text" = "名字";
-"b2Y-cj-hIk.text" = "請輸入郵箱地址和驗證碼";
+"b2Y-cj-hIk.text" = "請輸入帳號和驗證碼。";
 "bfy-hY-JzN.placeholder" = "請輸入驗證碼";
 "bkE-Ws-P7R.segmentTitles[0]" = "標準";
 "bkE-Ws-P7R.segmentTitles[1]" = "衞星";

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

@@ -390,7 +390,7 @@
 "ale-C0-Un0.text" = "名字";
 
 /* Class = "UILabel"; text = "Please enter and confirm your email address and complete the verification to reset your password"; ObjectID = "b2Y-cj-hIk"; */
-"b2Y-cj-hIk.text" = "请输入您的电子邮件地址和验证码。";
+"b2Y-cj-hIk.text" = "请输入账号和验证码。";
 
 /* Class = "UITextField"; placeholder = "请输入验证码"; ObjectID = "bfy-hY-JzN"; */
 "bfy-hY-JzN.placeholder" = "请输入验证码";