1.修改RA Image，增加文件压缩开关。

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

@@ -2,4 +2,22 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/upload/RANetworkTaskDelegate.m"
+            timestampString = "517385396.33492"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "83"
+            endingLineNumber = "83"
+            landmarkName = "-URLSession:task:didCompleteWithError:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

RA Image/RA Image/AppDelegate.h

@@ -24,6 +24,8 @@
 @property (nonatomic,strong) NSArray *modeList;
 @property (nonatomic,assign) BOOL shouldAutoShowModeVC;
 @property (assign) bool bEnable_Cache;
+@property (nonatomic,assign) BOOL compressFile;
+
 - (void)showNormalRootVC;
 - (void)showLoginVC;
 - (void)logout;

RA Image/RA Image/AppDelegate.m

@@ -158,6 +158,12 @@ void UncaughtExceptionHandler(NSException *exception) {
     self.rootVC = self.window.rootViewController;
     
 //    self.uploadManager.maxRetry = 2;
+    BOOL compress = YES;
+    NSDictionary *param = [[NSUserDefaults standardUserDefaults] objectForKey:kUploadSetting];
+    if (param) {
+        compress = [[param objectForKey:@"compress_img"] boolValue];
+    }
+    self.compressFile = compress;
     
     return YES;
 }

RA Image/RA Image/BasicModeViewController.m

@@ -41,6 +41,9 @@
                                 forKeyPath:@"queue_status"
                                    options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld)
                                    context:@"queue_status changed"];
+    if (appdelegate.compressFile) {
+        [RAUtils message_alert:@"The photos will be compressed" title:@"Attention" controller:self];
+    }
 }
 -(void) dealloc
 {
@@ -284,8 +287,10 @@
 }
 
 - (NSString *)saveImage:(UIImage *)img {
-    
-    img = [ImageUtils img_compress:img kbsize:1024];
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    if (appDelegate.compressFile) {
+        img = [ImageUtils img_compress:img kbsize:1024];
+    }
     
     NSString *dir = [NSString stringWithFormat:@"%@/%@",NSTemporaryDirectory(),self.name];
     

RA Image/RA Image/Upload.storyboard

@@ -34,11 +34,11 @@
                                                 <rect key="frame" x="0.0" y="28" width="375" 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="375" height="100"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
                                                     <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">
-                                                            <rect key="frame" x="10" y="5" width="355" height="20"/>
+                                                            <rect key="frame" x="10" y="5" width="647" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="20" id="bKP-Fo-NMF"/>
                                                             </constraints>
@@ -47,13 +47,13 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="NYs-S2-H37">
-                                                            <rect key="frame" x="10" y="35" width="355" height="5"/>
+                                                            <rect key="frame" x="10" y="35" width="647" height="5"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="5" id="QYr-rE-zSp"/>
                                                             </constraints>
                                                         </progressView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99.9%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Qr-iv-UsW">
-                                                            <rect key="frame" x="315" y="45" width="50" height="21"/>
+                                                            <rect key="frame" x="607" y="45" width="50" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="8Tc-O3-69h"/>
                                                                 <constraint firstAttribute="width" constant="50" id="ljZ-ci-ehG"/>
@@ -63,13 +63,13 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Waiting" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DED-nv-Rm5">
-                                                            <rect key="frame" x="10" y="45" width="295" height="21"/>
+                                                            <rect key="frame" x="10" y="45" width="587" height="21"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Error:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AOp-qH-n4C">
-                                                            <rect key="frame" x="10" y="71" width="355" height="17"/>
+                                                            <rect key="frame" x="10" y="71" width="647" height="17"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
@@ -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="16" y="180" width="237" height="31"/>
+                                <rect key="frame" x="16" y="215.5" width="237" height="31"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -192,7 +192,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HEJ-Eh-vI4">
-                                <rect key="frame" x="284" y="180" width="49" height="31"/>
+                                <rect key="frame" x="284" y="215.5" width="49" height="31"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
@@ -200,38 +200,55 @@
                                     <outlet property="delegate" destination="rW7-Ba-NwZ" id="xof-xb-fnp"/>
                                 </connections>
                             </textField>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZKg-aU-mIC">
+                                <rect key="frame" x="284" y="175" width="51" height="31"/>
+                                <connections>
+                                    <action selector="autoRmErrClick:" destination="rW7-Ba-NwZ" eventType="valueChanged" id="j2v-FC-9dI"/>
+                                    <action selector="compressSwitchClick:" destination="rW7-Ba-NwZ" eventType="valueChanged" id="7It-Um-Jee"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Should Compress Image" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="13k-tQ-BSv">
+                                <rect key="frame" x="16" y="180" width="187" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="PZj-IO-85H" firstAttribute="top" secondItem="uVx-M4-Qy4" secondAttribute="top" id="1CF-Sg-YfU"/>
                             <constraint firstItem="5Zr-Ac-9Ae" firstAttribute="top" secondItem="uVx-M4-Qy4" secondAttribute="bottom" constant="10" id="2oq-dc-wzL"/>
+                            <constraint firstItem="13k-tQ-BSv" firstAttribute="top" secondItem="lG4-HU-q7O" secondAttribute="bottom" constant="15" id="3l1-3S-bZz"/>
                             <constraint firstItem="gOA-fB-4s1" firstAttribute="leading" secondItem="FYV-4e-6Ap" secondAttribute="leading" id="5jc-nd-fCa"/>
                             <constraint firstItem="FYV-4e-6Ap" firstAttribute="leading" secondItem="PZj-IO-85H" secondAttribute="leading" id="7Vf-0z-Ijh"/>
                             <constraint firstAttribute="trailingMargin" secondItem="PZj-IO-85H" secondAttribute="trailing" constant="26" id="7bo-vv-OW6"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="leading" secondItem="lG4-HU-q7O" secondAttribute="leading" id="7vL-et-gIa"/>
-                            <constraint firstItem="FYV-4e-6Ap" firstAttribute="top" secondItem="5Zr-Ac-9Ae" secondAttribute="top" id="9UF-cn-aDD"/>
                             <constraint firstItem="lG4-HU-q7O" firstAttribute="height" secondItem="5Zr-Ac-9Ae" secondAttribute="height" id="CWZ-uW-HAw"/>
                             <constraint firstItem="5Zr-Ac-9Ae" firstAttribute="height" secondItem="uVx-M4-Qy4" secondAttribute="height" id="CvC-FX-OHH"/>
+                            <constraint firstItem="I3J-dT-AiE" firstAttribute="top" secondItem="13k-tQ-BSv" secondAttribute="bottom" constant="15" id="E4d-jg-ezx"/>
+                            <constraint firstItem="ZKg-aU-mIC" firstAttribute="centerY" secondItem="13k-tQ-BSv" secondAttribute="centerY" id="G5E-v9-6Fa"/>
+                            <constraint firstItem="13k-tQ-BSv" firstAttribute="leading" secondItem="lG4-HU-q7O" secondAttribute="leading" id="Gje-d8-QLD"/>
                             <constraint firstItem="FYV-4e-6Ap" firstAttribute="height" secondItem="PZj-IO-85H" secondAttribute="height" id="HBu-2m-WlK"/>
                             <constraint firstItem="lG4-HU-q7O" firstAttribute="leading" secondItem="5Zr-Ac-9Ae" secondAttribute="leading" id="ItV-fy-FwH"/>
-                            <constraint firstItem="HEJ-Eh-vI4" firstAttribute="top" secondItem="I3J-dT-AiE" secondAttribute="top" id="KJB-9f-eYb"/>
                             <constraint firstAttribute="leadingMargin" secondItem="uVx-M4-Qy4" secondAttribute="leading" id="Ka9-Iq-uvp"/>
-                            <constraint firstItem="I3J-dT-AiE" firstAttribute="top" secondItem="lG4-HU-q7O" secondAttribute="bottom" constant="15" id="Ltl-vO-rpE"/>
                             <constraint firstItem="HEJ-Eh-vI4" firstAttribute="height" secondItem="gOA-fB-4s1" secondAttribute="height" id="NM8-u8-jta"/>
-                            <constraint firstItem="gOA-fB-4s1" firstAttribute="top" secondItem="lG4-HU-q7O" secondAttribute="top" id="THR-kR-dIS"/>
                             <constraint firstItem="FYV-4e-6Ap" firstAttribute="width" secondItem="PZj-IO-85H" secondAttribute="width" id="Uoh-7Q-2ek"/>
                             <constraint firstItem="PZj-IO-85H" firstAttribute="leading" secondItem="uVx-M4-Qy4" secondAttribute="trailing" constant="31" id="Vzf-9z-cAO"/>
                             <constraint firstItem="uVx-M4-Qy4" firstAttribute="top" secondItem="8l0-nk-W7m" secondAttribute="bottom" constant="32" id="aVf-kB-5t2"/>
                             <constraint firstItem="5Zr-Ac-9Ae" firstAttribute="width" secondItem="uVx-M4-Qy4" secondAttribute="width" id="bal-FY-Ct5"/>
+                            <constraint firstItem="HEJ-Eh-vI4" firstAttribute="centerY" secondItem="I3J-dT-AiE" secondAttribute="centerY" id="cRH-a8-dSK"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="width" secondItem="lG4-HU-q7O" secondAttribute="width" id="dyG-F0-Vmd"/>
                             <constraint firstItem="HEJ-Eh-vI4" firstAttribute="leading" secondItem="gOA-fB-4s1" secondAttribute="leading" id="e3N-xS-gDH"/>
                             <constraint firstItem="HEJ-Eh-vI4" firstAttribute="width" secondItem="gOA-fB-4s1" secondAttribute="width" id="f20-8E-4h4"/>
                             <constraint firstItem="I3J-dT-AiE" firstAttribute="height" secondItem="lG4-HU-q7O" secondAttribute="height" id="he9-5F-FKV"/>
                             <constraint firstItem="PZj-IO-85H" firstAttribute="height" secondItem="uVx-M4-Qy4" secondAttribute="height" id="pDj-6j-QwR"/>
+                            <constraint firstItem="ZKg-aU-mIC" firstAttribute="leading" secondItem="gOA-fB-4s1" secondAttribute="leading" id="pjc-md-epB"/>
+                            <constraint firstItem="PZj-IO-85H" firstAttribute="centerY" secondItem="uVx-M4-Qy4" secondAttribute="centerY" id="sNt-TE-Wt7"/>
                             <constraint firstItem="lG4-HU-q7O" firstAttribute="top" secondItem="5Zr-Ac-9Ae" secondAttribute="bottom" constant="10" id="tha-TB-ufH"/>
+                            <constraint firstItem="gOA-fB-4s1" firstAttribute="centerY" secondItem="lG4-HU-q7O" secondAttribute="centerY" id="w7n-jz-bfA"/>
                             <constraint firstItem="gOA-fB-4s1" firstAttribute="height" secondItem="FYV-4e-6Ap" secondAttribute="height" id="xHY-5Q-Rzf"/>
                             <constraint firstItem="5Zr-Ac-9Ae" firstAttribute="leading" secondItem="uVx-M4-Qy4" secondAttribute="leading" id="xYh-My-SJg"/>
                             <constraint firstItem="lG4-HU-q7O" firstAttribute="width" secondItem="5Zr-Ac-9Ae" secondAttribute="width" id="y6D-h3-KMb"/>
+                            <constraint firstItem="FYV-4e-6Ap" firstAttribute="centerY" secondItem="5Zr-Ac-9Ae" secondAttribute="centerY" id="yLL-Mq-hQ6"/>
                             <constraint firstItem="gOA-fB-4s1" firstAttribute="width" secondItem="FYV-4e-6Ap" secondAttribute="width" id="zMI-7M-I2I"/>
                         </constraints>
                     </view>
@@ -239,6 +256,7 @@
                         <outlet property="autoRmErrorSwith" destination="gOA-fB-4s1" id="Qaa-bt-Q9U"/>
                         <outlet property="autoRmFinishSwitch" destination="FYV-4e-6Ap" id="eTP-xV-a6u"/>
                         <outlet property="autoSwitch" destination="PZj-IO-85H" id="Nyl-DU-coe"/>
+                        <outlet property="compressSwitch" destination="ZKg-aU-mIC" id="f1D-bt-5Oc"/>
                         <outlet property="retryCountBox" destination="HEJ-Eh-vI4" id="O5k-Ja-8k2"/>
                     </connections>
                 </viewController>

RA Image/RA Image/UploadSettingController.m

@@ -17,6 +17,7 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 @property (strong, nonatomic) IBOutlet UITextField *retryCountBox;
 @property (strong, nonatomic) IBOutlet UISwitch *autoRmFinishSwitch;
 @property (strong, nonatomic) IBOutlet UISwitch *autoRmErrorSwith;
+@property (strong, nonatomic) IBOutlet UISwitch *compressSwitch;
 
 @end
 
@@ -28,10 +29,11 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     
     UIBarButtonItem *saveItem = [[UIBarButtonItem alloc] initWithTitle:@"Save" style:UIBarButtonItemStylePlain target:self action:@selector(saveItemClick:)];
     self.navigationItem.rightBarButtonItem = saveItem;
-    
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
     BOOL autoUpload = YES;
     BOOL autoRmFinish = YES;
     BOOL autoRmErr = NO;
+    BOOL compress = YES;
     int retryCount = 2;
     NSDictionary *param = [self userDefaultsValue:kUploadSetting];
     if (param) {
@@ -39,18 +41,21 @@ NSString *const kUploadSetting = @"UploadSettingKey";
         retryCount = [[param objectForKey:@"retry_count"] intValue];
         autoRmFinish = [[param objectForKey:@"auto_rm_finish"] boolValue];
         autoRmErr = [[param objectForKey:@"auto_rm_error"] boolValue];
+        compress = [[param objectForKey:@"compress_img"] boolValue];
     } else {
-        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+        
         autoUpload = appDelegate.uploadManager.autoStart;
         retryCount = appDelegate.uploadManager.maxRetry;
         autoRmFinish = appDelegate.uploadManager.removeFinish;
         autoRmErr = appDelegate.uploadManager.removeError;
+        compress = appDelegate.compressFile;
 
     }
     self.autoSwitch.on = autoUpload;
     self.autoRmFinishSwitch.on = autoRmFinish;
     self.autoRmErrorSwith.on = autoRmErr;
     self.retryCountBox.text = [NSString stringWithFormat:@"%d",retryCount];
+    self.compressSwitch.on = compress;
     
     [self registListenKeyboard];
 }
@@ -72,16 +77,22 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 - (IBAction)autoRmErrClick:(UISwitch *)sender {
 }
 
+- (IBAction)compressSwitchClick:(UISwitch *)sender {
+    
+}
+
 - (void)saveItemClick:(UIBarButtonItem *)sender {
     BOOL autoUpload = self.autoSwitch.isOn;
     BOOL autoRmFinish = self.autoRmFinishSwitch.isOn;
     BOOL autoRmErr = self.autoRmErrorSwith.isOn;
+    BOOL compress = self.compressSwitch.isOn;
     int retryCount = [self.retryCountBox.text intValue];
     
     NSDictionary *param = @{
                             @"auto_upload" : @(autoUpload),
                             @"auto_rm_finish"   : @(autoRmFinish),
                             @"auto_rm_error"    : @(autoRmErr),
+                            @"compress_img"     : @(compress),
                             @"retry_count" : @(retryCount)
                             };
     [self setUserDefaultsValue:param forKey:kUploadSetting];
@@ -91,6 +102,7 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     appDelegate.uploadManager.autoStart = autoUpload;
     appDelegate.uploadManager.removeFinish = autoRmFinish;
     appDelegate.uploadManager.removeError = autoRmErr;
+    appDelegate.compressFile = compress;
     
     [self.navigationController popViewControllerAnimated:YES];
 }