1.修改RA Image iOS，增加重试等待时间设置。

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

@@ -13,5 +13,21 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/upload/RAUploadOperation.m"
+            timestampString = "531826988.995198"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "158"
+            endingLineNumber = "158"
+            landmarkName = "-start"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA Image/RA Image/Upload.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -34,7 +34,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="414" height="100"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="p1C-Cy-yXq" id="tdd-mO-6vJ">
-                                                    <rect key="frame" x="0.0" y="0.0" width="414" height="100"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="414" height="99.666666666666671"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QS8884456999666666" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0VW-ZZ-YcB">
@@ -162,7 +162,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Max Retry Count" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I3J-dT-AiE">
-                                <rect key="frame" x="20" y="190" width="160" height="31"/>
+                                <rect key="frame" x="20" y="190" width="177" height="31"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="31" id="dtu-05-Dlj"/>
                                 </constraints>
@@ -196,7 +196,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Only Upload Via WiFi" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9mp-ot-ria">
-                                <rect key="frame" x="20" y="144" width="160" height="31"/>
+                                <rect key="frame" x="20" y="144" width="177" height="31"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="31" id="sH7-4Y-wnX"/>
                                 </constraints>
@@ -211,6 +211,21 @@
                                     <action selector="compressSwitchClick:" destination="rW7-Ba-NwZ" eventType="valueChanged" id="Zg7-r2-eDx"/>
                                 </connections>
                             </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Retry Wait TimeInterval" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Obs-D8-0Z4">
+                                <rect key="frame" x="20" y="229" width="177" height="31"/>
+                                <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="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Vag-Wo-2aj">
+                                <rect key="frame" x="319" y="229.66666666666666" width="49" height="29.999999999999972"/>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
+                                <connections>
+                                    <outlet property="delegate" destination="rW7-Ba-NwZ" id="Ujt-Jg-TCb"/>
+                                </connections>
+                            </textField>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
@@ -221,15 +236,22 @@
                             <constraint firstItem="pSj-dG-qXr" firstAttribute="height" secondItem="ZKg-aU-mIC" secondAttribute="height" id="ERz-NS-CbM"/>
                             <constraint firstItem="pSj-dG-qXr" firstAttribute="leading" secondItem="ZKg-aU-mIC" secondAttribute="leading" id="Ecj-cf-DyC"/>
                             <constraint firstItem="ZKg-aU-mIC" firstAttribute="centerY" secondItem="13k-tQ-BSv" secondAttribute="centerY" id="G5E-v9-6Fa"/>
+                            <constraint firstItem="Obs-D8-0Z4" firstAttribute="height" secondItem="I3J-dT-AiE" secondAttribute="height" id="Gbv-14-jyx"/>
+                            <constraint firstItem="Obs-D8-0Z4" firstAttribute="leading" secondItem="I3J-dT-AiE" secondAttribute="leading" id="IcR-qm-pUI"/>
                             <constraint firstItem="pSj-dG-qXr" firstAttribute="trailing" secondItem="HEJ-Eh-vI4" secondAttribute="trailing" id="K0X-RP-MCo"/>
                             <constraint firstAttribute="leadingMargin" secondItem="uVx-M4-Qy4" secondAttribute="leading" id="Ka9-Iq-uvp"/>
+                            <constraint firstItem="Obs-D8-0Z4" firstAttribute="top" secondItem="I3J-dT-AiE" secondAttribute="bottom" constant="8" id="PWH-jI-vUP"/>
                             <constraint firstItem="13k-tQ-BSv" firstAttribute="top" secondItem="uVx-M4-Qy4" secondAttribute="bottom" constant="15" id="Qmv-4f-CND"/>
                             <constraint firstItem="9mp-ot-ria" firstAttribute="top" secondItem="13k-tQ-BSv" secondAttribute="bottom" constant="15" id="RXW-aO-3lO"/>
                             <constraint firstItem="PZj-IO-85H" firstAttribute="leading" secondItem="uVx-M4-Qy4" secondAttribute="trailing" constant="31" id="Vzf-9z-cAO"/>
+                            <constraint firstItem="Vag-Wo-2aj" firstAttribute="top" secondItem="Obs-D8-0Z4" secondAttribute="top" id="Y8N-dT-x73"/>
+                            <constraint firstItem="Vag-Wo-2aj" firstAttribute="height" secondItem="HEJ-Eh-vI4" secondAttribute="height" id="ZIa-fM-Hx7"/>
                             <constraint firstItem="HEJ-Eh-vI4" firstAttribute="top" secondItem="I3J-dT-AiE" secondAttribute="top" id="aD3-c9-GaE"/>
                             <constraint firstItem="uVx-M4-Qy4" firstAttribute="top" secondItem="8l0-nk-W7m" secondAttribute="bottom" constant="32" id="aVf-kB-5t2"/>
+                            <constraint firstItem="Obs-D8-0Z4" firstAttribute="width" secondItem="I3J-dT-AiE" secondAttribute="width" id="adg-h1-9cx"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="top" secondItem="9mp-ot-ria" secondAttribute="bottom" constant="15" id="csP-fg-iDf"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="width" secondItem="9mp-ot-ria" secondAttribute="width" id="dMq-mX-UG5"/>
+                            <constraint firstItem="Vag-Wo-2aj" firstAttribute="leading" secondItem="HEJ-Eh-vI4" secondAttribute="leading" id="gkL-ym-J0y"/>
                             <constraint firstItem="HEJ-Eh-vI4" firstAttribute="leading" secondItem="pSj-dG-qXr" secondAttribute="leading" id="jS2-Bl-NWa"/>
                             <constraint firstItem="13k-tQ-BSv" firstAttribute="leading" secondItem="uVx-M4-Qy4" secondAttribute="leading" id="kJm-Nv-4dy"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="height" secondItem="9mp-ot-ria" secondAttribute="height" id="oAY-mc-aaO"/>
@@ -237,6 +259,7 @@
                             <constraint firstItem="PZj-IO-85H" firstAttribute="height" secondItem="uVx-M4-Qy4" secondAttribute="height" id="pDj-6j-QwR"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="leading" secondItem="9mp-ot-ria" secondAttribute="leading" id="qpf-ne-VUI"/>
                             <constraint firstItem="PZj-IO-85H" firstAttribute="centerY" secondItem="uVx-M4-Qy4" secondAttribute="centerY" id="sNt-TE-Wt7"/>
+                            <constraint firstItem="Vag-Wo-2aj" firstAttribute="width" secondItem="HEJ-Eh-vI4" secondAttribute="width" id="vlH-k7-OWA"/>
                         </constraints>
                     </view>
                     <connections>
@@ -244,6 +267,7 @@
                         <outlet property="compressSwitch" destination="ZKg-aU-mIC" id="f1D-bt-5Oc"/>
                         <outlet property="onlyWiFiSwitch" destination="pSj-dG-qXr" id="ahs-FF-JEa"/>
                         <outlet property="retryCountBox" destination="HEJ-Eh-vI4" id="O5k-Ja-8k2"/>
+                        <outlet property="retryTimeIntervalBox" destination="Vag-Wo-2aj" id="poT-JG-m7X"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mh9-70-UUG" userLabel="First Responder" sceneMemberID="firstResponder"/>

RA Image/RA Image/UploadSettingController.m

@@ -19,6 +19,7 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 //@property (strong, nonatomic) IBOutlet UISwitch *autoRmErrorSwith;
 @property (strong, nonatomic) IBOutlet UISwitch *compressSwitch;
 @property (strong, nonatomic) IBOutlet UISwitch *onlyWiFiSwitch;
+@property (strong, nonatomic) IBOutlet UITextField *retryTimeIntervalBox;
 
 @end
 
@@ -37,6 +38,8 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     BOOL compress = YES;
     BOOL onlyWiFi = NO;
     int retryCount = 5;
+    int retryTimeInterval = 300;
+    
     NSDictionary *param = [self userDefaultsValue:kUploadSetting];
     if (param) {
         autoUpload = [[param objectForKey:@"auto_upload"] boolValue];
@@ -45,6 +48,10 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 //        autoRmErr = [[param objectForKey:@"auto_rm_error"] boolValue];
         compress = [[param objectForKey:@"compress_img"] boolValue];
         onlyWiFi = [[param objectForKey:@"only_wifi"] boolValue];
+        NSNumber *timeInterval = [param objectForKey:@"retry_time_interval"];
+        if (timeInterval != nil) {
+            retryTimeInterval = [timeInterval intValue];
+        }
     } else {
         
         autoUpload = appDelegate.uploadManager.autoStart;
@@ -53,6 +60,7 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 //        autoRmErr = appDelegate.uploadManager.removeError;
         compress = appDelegate.compressFile;
         onlyWiFi = appDelegate.uploadManager.onlyWiFi;
+        retryTimeInterval = appDelegate.uploadManager.retryTimeInterval;
     }
     self.autoSwitch.on = autoUpload;
 //    self.autoRmFinishSwitch.on = autoRmFinish;
@@ -60,6 +68,7 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     self.retryCountBox.text = [NSString stringWithFormat:@"%d",retryCount];
     self.compressSwitch.on = compress;
     self.onlyWiFiSwitch.on = onlyWiFi;
+    self.retryTimeIntervalBox.text = [NSString stringWithFormat:@"%d",retryTimeInterval];
     [self registListenKeyboard];
 }
 
@@ -91,13 +100,15 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     BOOL compress = self.compressSwitch.isOn;
     int retryCount = [self.retryCountBox.text intValue];
     BOOL onlyWiFi = self.onlyWiFiSwitch.isOn;
+    int retryTimeInterval = [self.retryTimeIntervalBox.text intValue];
     NSDictionary *param = @{
                             @"auto_upload" : @(autoUpload),
 //                            @"auto_rm_finish"   : @(autoRmFinish),
 //                            @"auto_rm_error"    : @(autoRmErr),
                             @"compress_img"     : @(compress),
                             @"retry_count" : @(retryCount),
-                            @"only_wifi" : @(onlyWiFi)
+                            @"only_wifi" : @(onlyWiFi),
+                            @"retry_time_interval" : @(retryTimeInterval)
                             };
     [self setUserDefaultsValue:param forKey:kUploadSetting];
     
@@ -108,6 +119,7 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 //    appDelegate.uploadManager.removeError = autoRmErr;
     appDelegate.compressFile = compress;
     appDelegate.uploadManager.onlyWiFi = onlyWiFi;
+    appDelegate.uploadManager.retryTimeInterval = retryTimeInterval;
     
     [self.navigationController popViewControllerAnimated:YES];
 }