Quellcode durchsuchen

1.修改RA Image上传设置,增加Auto Remove Finish和Auto Remove Error。

Pen Li vor 9 Jahren
Ursprung
Commit
017424c96b

BIN
RA Image/RA Image.xcodeproj/project.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 12
RA Image/RA Image.xcodeproj/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,16 +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>
-   </Breakpoints>
 </Bucket>

+ 53 - 10
RA Image/RA Image/Upload.storyboard

@@ -161,14 +161,38 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Max Retry Count" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I3J-dT-AiE">
-                                <rect key="frame" x="16" y="116" width="237" height="31"/>
+                            <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"/>
+                                <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="FYV-4e-6Ap">
+                                <rect key="frame" x="284" y="93" width="51" height="31"/>
+                                <connections>
+                                    <action selector="autoRmFinishClick:" destination="rW7-Ba-NwZ" eventType="valueChanged" id="8Bw-uk-9Do"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto Remove Finish" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Zr-Ac-9Ae">
+                                <rect key="frame" x="16" y="93" width="237" height="31"/>
+                                <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="gOA-fB-4s1">
+                                <rect key="frame" x="284" y="134" width="51" height="31"/>
+                                <connections>
+                                    <action selector="autoRmErrClick:" destination="rW7-Ba-NwZ" eventType="valueChanged" id="KtW-o9-qW6"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto Remove Error" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lG4-HU-q7O">
+                                <rect key="frame" x="16" y="134" width="237" 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="HEJ-Eh-vI4">
-                                <rect key="frame" x="284" y="116" width="49" height="31"/>
+                                <rect key="frame" x="284" y="180" width="49" height="31"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
@@ -180,21 +204,40 @@
                         <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="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="top" secondItem="uVx-M4-Qy4" secondAttribute="bottom" constant="33" id="GLg-mZ-edl"/>
+                            <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="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="height" secondItem="uVx-M4-Qy4" secondAttribute="height" id="NI9-6j-y0f"/>
+                            <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="HEJ-Eh-vI4" firstAttribute="leading" secondItem="PZj-IO-85H" secondAttribute="leading" id="Zc0-sx-Stz"/>
                             <constraint firstItem="uVx-M4-Qy4" firstAttribute="top" secondItem="8l0-nk-W7m" secondAttribute="bottom" constant="32" id="aVf-kB-5t2"/>
-                            <constraint firstItem="I3J-dT-AiE" firstAttribute="leading" secondItem="uVx-M4-Qy4" secondAttribute="leading" id="aVx-QK-TDV"/>
-                            <constraint firstItem="HEJ-Eh-vI4" firstAttribute="width" secondItem="PZj-IO-85H" secondAttribute="width" id="iC1-8X-ikq"/>
-                            <constraint firstItem="HEJ-Eh-vI4" firstAttribute="height" secondItem="I3J-dT-AiE" secondAttribute="height" id="ite-dz-SB3"/>
+                            <constraint firstItem="5Zr-Ac-9Ae" firstAttribute="width" secondItem="uVx-M4-Qy4" secondAttribute="width" id="bal-FY-Ct5"/>
+                            <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="HEJ-Eh-vI4" firstAttribute="top" secondItem="I3J-dT-AiE" secondAttribute="top" id="y2V-7s-eKO"/>
+                            <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="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="gOA-fB-4s1" firstAttribute="width" secondItem="FYV-4e-6Ap" secondAttribute="width" id="zMI-7M-I2I"/>
                         </constraints>
                     </view>
                     <connections>
+                        <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="retryCountBox" destination="HEJ-Eh-vI4" id="O5k-Ja-8k2"/>
                     </connections>

+ 21 - 1
RA Image/RA Image/UploadSettingController.m

@@ -15,6 +15,8 @@ NSString *const kUploadSetting = @"UploadSettingKey";
 
 @property (strong, nonatomic) IBOutlet UISwitch *autoSwitch;
 @property (strong, nonatomic) IBOutlet UITextField *retryCountBox;
+@property (strong, nonatomic) IBOutlet UISwitch *autoRmFinishSwitch;
+@property (strong, nonatomic) IBOutlet UISwitch *autoRmErrorSwith;
 
 @end
 
@@ -28,18 +30,26 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     self.navigationItem.rightBarButtonItem = saveItem;
     
     BOOL autoUpload = YES;
+    BOOL autoRmFinish = YES;
+    BOOL autoRmErr = YES;
     int retryCount = 2;
     NSDictionary *param = [self userDefaultsValue:kUploadSetting];
     if (param) {
         autoUpload = [[param objectForKey:@"auto_upload"] boolValue];
         retryCount = [[param objectForKey:@"retry_count"] intValue];
-        
+        autoRmFinish = [[param objectForKey:@"auto_rm_finish"] boolValue];
+        autoRmErr = [[param objectForKey:@"auto_rm_error"] boolValue];
     } else {
         AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         autoUpload = appDelegate.uploadManager.autoStart;
         retryCount = appDelegate.uploadManager.maxRetry;
+        autoRmFinish = appDelegate.uploadManager.removeFinish;
+        autoRmErr = appDelegate.uploadManager.removeError;
+
     }
     self.autoSwitch.on = autoUpload;
+    self.autoRmFinishSwitch.on = autoRmFinish;
+    self.autoRmErrorSwith.on = autoRmErr;
     self.retryCountBox.text = [NSString stringWithFormat:@"%d",retryCount];
     
     [self registListenKeyboard];
@@ -56,12 +66,22 @@ NSString *const kUploadSetting = @"UploadSettingKey";
     
 }
 
+- (IBAction)autoRmFinishClick:(UISwitch *)sender {
+}
+
+- (IBAction)autoRmErrClick:(UISwitch *)sender {
+}
+
 - (void)saveItemClick:(UIBarButtonItem *)sender {
     BOOL autoUpload = self.autoSwitch.isOn;
+    BOOL autoRmFinish = self.autoRmFinishSwitch.isOn;
+    BOOL autoRmErr = self.autoRmErrorSwith.isOn;
     int retryCount = [self.retryCountBox.text intValue];
     
     NSDictionary *param = @{
                             @"auto_upload" : @(autoUpload),
+                            @"auto_rm_finish"   : @(autoRmFinish),
+                            @"auto_rm_error"    : @(autoRmErr),
                             @"retry_count" : @(retryCount)
                             };
     [self setUserDefaultsValue:param forKey:kUploadSetting];