1.调整RA Image登录界面和登录设置。

2.调整RA Image Barcode输入键盘类型。

RA Image/RA Image.xcodeproj/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,64 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../common/upload/RAUploadOperation.m"
-            timestampString = "516760817.992184"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "178"
-            endingLineNumber = "178"
-            landmarkName = "-filePath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../common/upload/RAUploadOperation.m"
-            timestampString = "516761228.725439"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "151"
-            endingLineNumber = "151"
-            landmarkName = "-start"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../common/upload/RAUploadManager.m"
-            timestampString = "516784754.799264"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "349"
-            endingLineNumber = "349"
-            landmarkName = "-startTask:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

RA Image/RA Image/AppDelegate.m

@@ -50,6 +50,9 @@
 }
 
 - (void)setCompanyIcon:(UIImage *)companyIcon {
+    if (!companyIcon) {
+        companyIcon = [UIImage imageNamed:@"AppIcon40x40"];
+    }
     _companyIcon = companyIcon;
     __weak typeof(self) weakself = self;
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -72,8 +75,12 @@
         dispatch_async(dispatch_get_global_queue(0, 0), ^{
             UIImage *img = [UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:url]]];
             if (weakself.bLogin) {
-                weakself.companyIcon = img;
-                [RAUtils saveData:UIImagePNGRepresentation(img) toPath:path];
+                if (img) {
+                    weakself.companyIcon = img;
+                    [RAUtils saveData:UIImagePNGRepresentation(img) toPath:path];
+                } else {
+                    weakself.companyIcon = [UIImage imageNamed:@"AppIcon40x40"];
+                }
             }
         });
     }
@@ -149,7 +156,6 @@ void UncaughtExceptionHandler(NSException *exception) {
     self.build =[infoDict objectForKey:@"CFBundleVersion"];
     self.rootVC = self.window.rootViewController;
     
-    
 //    self.uploadManager.maxRetry = 2;
     
     return YES;

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

@@ -76,7 +76,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="76b-Zz-kRV">
                                 <rect key="frame" x="0.0" y="64" width="375" height="70"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jOJ-Py-4V7">
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppIcon40x40" translatesAutoresizingMaskIntoConstraints="NO" id="jOJ-Py-4V7">
                                         <rect key="frame" x="10" y="10" width="50" height="50"/>
                                         <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <constraints>
@@ -189,26 +189,26 @@
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="tbZ-ys-B3a"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="30"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="40" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ZEy-rA-ish">
-                                <rect key="frame" x="0.0" y="190" width="375" height="160"/>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="50" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ZEy-rA-ish">
+                                <rect key="frame" x="0.0" y="190" width="375" height="200"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="160" id="qNy-dF-L1y"/>
+                                    <constraint firstAttribute="height" constant="200" id="qNy-dF-L1y"/>
                                 </constraints>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LoginTextFiledCell" rowHeight="40" id="AzG-Bz-3Gu" customClass="LoginTextFiledCell">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="40"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LoginTextFiledCell" rowHeight="50" id="AzG-Bz-3Gu" customClass="LoginTextFiledCell">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AzG-Bz-3Gu" id="DIU-Qe-sGe">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="fill" placeholder="place order" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="YXP-if-YQ2">
-                                                    <rect key="frame" x="10" y="5" width="355" height="29"/>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" placeholder="place order" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="YXP-if-YQ2">
+                                                    <rect key="frame" x="10" y="5" width="355" height="39.5"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits"/>
@@ -228,21 +228,21 @@
                                             <outlet property="textBox" destination="YXP-if-YQ2" id="rLi-GD-e77"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LoginSwitchCell" rowHeight="40" id="LYr-Om-Dpu" customClass="LoginSwitchCell">
-                                        <rect key="frame" x="0.0" y="68" width="375" height="40"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LoginSwitchCell" rowHeight="50" id="LYr-Om-Dpu" customClass="LoginSwitchCell">
+                                        <rect key="frame" x="0.0" y="78" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LYr-Om-Dpu" id="DQB-yC-XbO">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="记住我的登录状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l0F-dN-mYq">
-                                                    <rect key="frame" x="10" y="5" width="285" height="29.5"/>
+                                                    <rect key="frame" x="10" y="5" width="285" height="39.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ayl-9L-kj9">
-                                                    <rect key="frame" x="315" y="5" width="52" height="29.5"/>
+                                                    <rect key="frame" x="315" y="9.5" width="52" height="31"/>
                                                     <connections>
                                                         <action selector="switchClick:" destination="LYr-Om-Dpu" eventType="valueChanged" id="AD8-uu-gGL"/>
                                                     </connections>
@@ -250,10 +250,9 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="l0F-dN-mYq" firstAttribute="leading" secondItem="DQB-yC-XbO" secondAttribute="leading" constant="10" id="2Pv-EG-Typ"/>
+                                                <constraint firstItem="Ayl-9L-kj9" firstAttribute="centerY" secondItem="l0F-dN-mYq" secondAttribute="centerY" id="6oC-p4-LHA"/>
                                                 <constraint firstItem="l0F-dN-mYq" firstAttribute="top" secondItem="DQB-yC-XbO" secondAttribute="top" constant="5" id="AS5-qb-qmA"/>
                                                 <constraint firstAttribute="trailing" secondItem="Ayl-9L-kj9" secondAttribute="trailing" constant="10" id="KKL-7Y-rGz"/>
-                                                <constraint firstItem="Ayl-9L-kj9" firstAttribute="top" secondItem="DQB-yC-XbO" secondAttribute="top" constant="5" id="KeO-xb-xte"/>
-                                                <constraint firstAttribute="bottom" secondItem="Ayl-9L-kj9" secondAttribute="bottom" constant="5" id="MBN-lQ-Axe"/>
                                                 <constraint firstAttribute="bottom" secondItem="l0F-dN-mYq" secondAttribute="bottom" constant="5" id="sMp-Be-x6B"/>
                                                 <constraint firstItem="Ayl-9L-kj9" firstAttribute="leading" secondItem="l0F-dN-mYq" secondAttribute="trailing" constant="20" id="szM-HB-JH2"/>
                                                 <constraint firstAttribute="trailing" secondItem="l0F-dN-mYq" secondAttribute="trailing" constant="80" id="wBz-OH-Old"/>
@@ -282,22 +281,36 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9eS-az-Avg">
-                                <rect key="frame" x="20" y="380" width="335" height="50"/>
+                                <rect key="frame" x="20" y="420" width="335" height="50"/>
+                                <color key="backgroundColor" cocoaTouchSystemColor="lightTextColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="q1V-lL-5KU"/>
                                 </constraints>
-                                <state key="normal" title="Login"/>
+                                <state key="normal" title="Login">
+                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
                                 <connections>
                                     <action selector="loginBtnClick:" destination="l61-Sy-3V2" eventType="touchUpInside" id="ob0-JX-uK7"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="v1.0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KNq-Qe-MCi">
+                                <rect key="frame" x="337.5" y="637" width="27.5" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="20" id="pQX-il-KH2"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" red="0.10180238736934404" green="0.98262900114059448" blue="0.67473328857458892" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Qgm-gt-QHB" firstAttribute="leading" secondItem="eFV-Mf-82R" secondAttribute="leading" constant="10" id="Di9-kk-t7S"/>
                             <constraint firstAttribute="trailing" secondItem="ZEy-rA-ish" secondAttribute="trailing" id="NTf-3C-4Ro"/>
+                            <constraint firstAttribute="trailing" secondItem="KNq-Qe-MCi" secondAttribute="trailing" constant="10" id="V3y-Nf-hHp"/>
                             <constraint firstItem="9eS-az-Avg" firstAttribute="top" secondItem="ZEy-rA-ish" secondAttribute="bottom" constant="30" id="VHh-eU-GOx"/>
                             <constraint firstItem="7Tz-Ne-9Q4" firstAttribute="top" secondItem="H4k-R1-29n" secondAttribute="bottom" constant="80" id="aNW-Be-opP"/>
+                            <constraint firstItem="KNq-Qe-MCi" firstAttribute="bottom" secondItem="Qgm-gt-QHB" secondAttribute="bottom" id="dFz-ee-Wx1"/>
                             <constraint firstItem="9eS-az-Avg" firstAttribute="leading" secondItem="eFV-Mf-82R" secondAttribute="leading" constant="20" id="dQN-LQ-RKc"/>
                             <constraint firstItem="p61-40-fkz" firstAttribute="top" secondItem="Qgm-gt-QHB" secondAttribute="bottom" constant="10" id="dZy-Uz-47Q"/>
                             <constraint firstItem="ZEy-rA-ish" firstAttribute="top" secondItem="7Tz-Ne-9Q4" secondAttribute="bottom" constant="40" id="dkW-VQ-pSb"/>
@@ -312,11 +325,12 @@
                         <outlet property="loginBtn" destination="9eS-az-Avg" id="zus-dh-HZL"/>
                         <outlet property="loginTable" destination="ZEy-rA-ish" id="OM0-gg-rrj"/>
                         <outlet property="settingBtn" destination="Qgm-gt-QHB" id="W1I-7x-KJ6"/>
+                        <outlet property="versionLabel" destination="KNq-Qe-MCi" id="XzA-QQ-ZLM"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="QKd-iz-zHw" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="630" y="97"/>
+            <point key="canvasLocation" x="629.60000000000002" y="96.7016491754123"/>
         </scene>
         <!--Login Setting View Controller-->
         <scene sceneID="g1f-oD-LiL">
@@ -482,6 +496,7 @@
         </scene>
     </scenes>
     <resources>
+        <image name="AppIcon40x40" width="16" height="16"/>
         <image name="checkbox" width="16" height="16"/>
         <image name="checkbox_check" width="16" height="16"/>
         <image name="setting" width="60" height="60"/>

RA Image/RA Image/BasicModeViewController.h

@@ -20,7 +20,7 @@
 - (void)showPhotoList;
 - (void)showScanner;
 - (void)clickCameraButton;
-- (void)showBarcodeInput;
+- (void)showBarcodeInput:(UIKeyboardType)keyboardType;
 - (void)clearPhotos;
 - (void)showTopImage;
 #pragma mark - 需要子类重写

RA Image/RA Image/BasicModeViewController.m

@@ -250,7 +250,7 @@
 
 }
 
-- (void)showBarcodeInput {
+- (void)showBarcodeInput:(UIKeyboardType)keyboardType {
     [self tapResignFirstResponder:nil];
     __weak typeof(self) weakself = self;
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:@"Please enter %@ Code",self.barcodeTitle] message:nil preferredStyle:UIAlertControllerStyleAlert];
@@ -258,7 +258,7 @@
        
         textField.delegate = weakself;
         textField.clearButtonMode = UITextFieldViewModeWhileEditing;
-        
+        textField.keyboardType = keyboardType;
     }];
     
     UIAlertAction *OK = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {

RA Image/RA Image/LoginSettingViewController.h

@@ -8,6 +8,8 @@
 
 #import "BasicViewController.h"
 
+static NSString *kScanAddress = @"ScanAddress";
+
 @interface LoginSettingViewController : BasicViewController
 
 @property (nonatomic,copy) void(^returnValue)(NSString *);

RA Image/RA Image/LoginSettingViewController.m

@@ -9,7 +9,7 @@
 #import "LoginSettingViewController.h"
 #import "ScannerViewController.h"
 
-static NSString *kScanAddress = @"ScanAddress";
+
 
 @interface LoginSettingViewController ()<UITextFieldDelegate>
 

RA Image/RA Image/LoginViewController.m

@@ -18,6 +18,7 @@ static NSString *kLoginUserInfo = @"UserInfo";
 
 @property (strong, nonatomic) IBOutlet UITableView *loginTable;
 @property (nonatomic,strong) NSDictionary *dataDic;
+@property (strong, nonatomic) IBOutlet UILabel *versionLabel;
 @property (strong, nonatomic) IBOutlet UIButton *loginBtn;
 @property (strong, nonatomic) IBOutlet UIButton *settingBtn;
 @property (nonatomic,copy) NSString *address;
@@ -37,6 +38,13 @@ static NSString *kLoginUserInfo = @"UserInfo";
     [self loadData];
     [self.loginTable reloadData];
     [self registListenKeyboard];
+    
+    self.loginBtn.layer.cornerRadius = 25.0f;
+    self.loginBtn.clipsToBounds = YES;
+    
+    NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
+    NSString* short_version =[infoDict objectForKey:@"CFBundleShortVersionString"];
+    self.versionLabel.text = [NSString stringWithFormat:@"V%@",short_version];
 }
 
 
@@ -55,9 +63,20 @@ 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"];
+        }
+    }
+    
     NSDictionary *userData = [self userDefaultsValue:kLoginUserInfo];
     if (userData) {
-        self.address = [userData objectForKey:@"address"];
+//        self.address = [userData objectForKey:@"address"];
         self.user = [userData objectForKey:@"user"];
         self.pwd = [userData objectForKey:@"pwd"];
     }

RA Image/RA Image/ModelModeViewController.m

@@ -153,7 +153,7 @@
 //    [self.navigationController pushViewController:upVC animated:YES];
 }
 - (IBAction)typeBtnClick:(UIButton *)sender {
-    [self showBarcodeInput];
+    [self showBarcodeInput:UIKeyboardTypeDefault];
 }
 
 #pragma mark - Setter

RA Image/RA Image/PopModeViewController.m

@@ -116,7 +116,7 @@
 }
 
 - (IBAction)typeBtnClick:(UIButton *)sender {
-    [self showBarcodeInput];
+    [self showBarcodeInput:UIKeyboardTypeNumberPad];
 }
 
 #pragma mark - Super Method

RA Image/RA Image/RootViewController.m

@@ -42,6 +42,8 @@ static NSString *kLastMode = @"lastChooseMode";
     self.modeTable.tableFooterView = [UIView new];
     
     [self removeFirstResponderTap]; // 不然cell接受不了消息
+    
+    self.companyIcon = [UIImage imageNamed:@"AppIcon40x40"];
 }
 
 - (void)viewWillAppear:(BOOL)animated {