Ra image

修复每次启动会弹出连接设置的bug

1.05.33810

RA Image/RA Image/Base.lproj/Main.storyboard

@@ -14,7 +14,7 @@
         <scene sceneID="7ND-eH-sRU">
             <objects>
                 <navigationController id="zf9-JT-Kr2" customClass="RootNavigationController" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="fQ0-CT-SJq">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="fQ0-CT-SJq">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -344,8 +344,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T2p-m2-k3U">
+                                <rect key="frame" x="26" y="30" width="45" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="N4g-tS-PSF">
-                                <rect key="frame" x="26" y="40" width="323" height="30"/>
+                                <rect key="frame" x="26" y="61" width="323" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="m3z-CE-Fja"/>
                                 </constraints>
@@ -357,13 +363,13 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l39-8d-pmH">
-                                <rect key="frame" x="26" y="80" width="323" height="20.5"/>
+                                <rect key="frame" x="26" y="101" width="323" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="blU-4o-XVJ">
-                                <rect key="frame" x="26" y="111" width="323" height="30"/>
+                                <rect key="frame" x="26" y="132" width="323" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits"/>
@@ -376,11 +382,13 @@
                         <constraints>
                             <constraint firstItem="N4g-tS-PSF" firstAttribute="centerX" secondItem="mu4-lc-PRk" secondAttribute="centerX" id="4kc-tk-11e"/>
                             <constraint firstItem="N4g-tS-PSF" firstAttribute="leading" secondItem="mu4-lc-PRk" secondAttribute="leadingMargin" constant="10" id="ES9-Ie-txh"/>
+                            <constraint firstItem="T2p-m2-k3U" firstAttribute="top" secondItem="pYb-eQ-flk" secondAttribute="bottom" constant="10" id="OaF-TU-6MG"/>
                             <constraint firstItem="blU-4o-XVJ" firstAttribute="leading" secondItem="N4g-tS-PSF" secondAttribute="leading" id="TYO-qT-Lfe"/>
-                            <constraint firstItem="N4g-tS-PSF" firstAttribute="top" secondItem="pYb-eQ-flk" secondAttribute="bottom" constant="20" id="Wsp-KJ-ZGC"/>
                             <constraint firstItem="blU-4o-XVJ" firstAttribute="top" secondItem="l39-8d-pmH" secondAttribute="bottom" constant="10.5" id="aia-zU-K38"/>
+                            <constraint firstItem="T2p-m2-k3U" firstAttribute="leading" secondItem="mu4-lc-PRk" secondAttribute="leadingMargin" constant="10" id="bQX-1H-XT5"/>
                             <constraint firstItem="blU-4o-XVJ" firstAttribute="trailing" secondItem="N4g-tS-PSF" secondAttribute="trailing" id="dzp-sl-pBk"/>
                             <constraint firstItem="N4g-tS-PSF" firstAttribute="leading" secondItem="l39-8d-pmH" secondAttribute="leading" id="fYc-XM-SBg"/>
+                            <constraint firstItem="N4g-tS-PSF" firstAttribute="top" secondItem="T2p-m2-k3U" secondAttribute="bottom" constant="10" id="git-Pc-4Dz"/>
                             <constraint firstItem="N4g-tS-PSF" firstAttribute="trailing" secondItem="l39-8d-pmH" secondAttribute="trailing" id="lkD-tS-c4j"/>
                             <constraint firstItem="l39-8d-pmH" firstAttribute="top" secondItem="N4g-tS-PSF" secondAttribute="bottom" constant="10" id="m4L-qY-0Rn"/>
                         </constraints>

RA Image/RA Image/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.05</string>
 	<key>CFBundleVersion</key>
-	<string>33806</string>
+	<string>33810</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

RA Image/RA Image/LoginViewController.m

@@ -85,13 +85,14 @@ static NSString *kLoginUserInfo = @"UserInfo";
 - (void)initUserData {
     NSDictionary *addressDic = [self userDefaultsValue:kScanAddress];
     if (addressDic) {
-        NSUInteger selectedIndex = [[addressDic objectForKey:@"selectedIndex"] integerValue];
-        if (selectedIndex == 1) {
-            self.address = [addressDic objectForKey:@"internalAddress"];
-        }
-        if (selectedIndex == 2) {
-            self.address = [addressDic objectForKey:@"externalAddress"];
-        }
+//        NSUInteger selectedIndex = [[addressDic objectForKey:@"selectedIndex"] integerValue];
+//        if (selectedIndex == 1) {
+//            self.address = [addressDic objectForKey:@"serverAddress"];
+//        }
+//        if (selectedIndex == 2) {
+//            self.address = [addressDic objectForKey:@"serverAddress"];
+//        }
+        self.address = [addressDic objectForKey:@"serverAddress"];
     }
     
     if (!self.address.length){