Эх сурвалжийг харах

RA Image

清除任务时同时删除文件。
Ray Zhang 9 жил өмнө
parent
commit
15ffe74366

BIN
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -72,6 +72,7 @@
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
 		71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */; };
 		71BBFC3A1E651CC4008668A7 /* DocnotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC391E651CC4008668A7 /* DocnotesViewController.m */; };
+		71F8D0341EC057A2002003DB /* RANetworkTaskDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -198,6 +199,8 @@
 		71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtDocumentsViewController.m; path = ../../common/ExtDocumentsViewController.m; sourceTree = "<group>"; };
 		71BBFC381E651CC4008668A7 /* DocnotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocnotesViewController.h; path = ../../common/DocnotesViewController.h; sourceTree = "<group>"; };
 		71BBFC391E651CC4008668A7 /* DocnotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocnotesViewController.m; path = ../../common/DocnotesViewController.m; sourceTree = "<group>"; };
+		71F8D0321EC057A2002003DB /* RANetworkTaskDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RANetworkTaskDelegate.h; path = ../../../common/upload/RANetworkTaskDelegate.h; sourceTree = "<group>"; };
+		71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RANetworkTaskDelegate.m; path = ../../../common/upload/RANetworkTaskDelegate.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -254,6 +257,8 @@
 				7128C2671E124FF200FF635B /* Main.storyboard */,
 				7128C2691E124FF200FF635B /* LaunchScreen.storyboard */,
 				7128C24F1E124F4500FF635B /* Info.plist */,
+				71F8D0321EC057A2002003DB /* RANetworkTaskDelegate.h */,
+				71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */,
 				7128C3361E12540F00FF635B /* ACNetwork.h */,
 				7128C3371E12540F00FF635B /* ACNetwork.m */,
 				7128C3381E12540F00FF635B /* AppDelegate.h */,
@@ -537,6 +542,7 @@
 				7128C2B11E1250CA00FF635B /* PDFDrawable.m in Sources */,
 				7128C2E71E12511B00FF635B /* AESCrypt.m in Sources */,
 				7128C2B21E1250CA00FF635B /* PDFPage.m in Sources */,
+				71F8D0341EC057A2002003DB /* RANetworkTaskDelegate.m in Sources */,
 				7115D4271E13B70C00EF4E4C /* DocumentListViewController.m in Sources */,
 				7128C33A1E12540F00FF635B /* ACNetwork.m in Sources */,
 				7128C2B71E1250CA00FF635B /* RectDrawable.m in Sources */,

+ 2 - 2
Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist

@@ -34,9 +34,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.30</string>
+	<string>1.31</string>
 	<key>CFBundleVersion</key>
-	<string>32299</string>
+	<string>32383</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

+ 1 - 1
Ants Contract/Granite Expo eSign/Granite Expo eSign/config.h

@@ -18,7 +18,7 @@
 //#define ENCRYPT_OFF
 # ifdef DEBUG
     #define NO_SAVE_VERIFY true
-//    #define test_server
+    #define test_server
 # else
     #define NO_SAVE_VERIFY false
 # endif

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


+ 10 - 2
common/upload/RAUploadManager.m

@@ -80,17 +80,25 @@
 -(void) removeTasks:(NSMutableArray*) tasks
 {
     
-    
+    NSFileManager* fmanager = [NSFileManager new];
     for(NSMutableDictionary* task in tasks)
+    {
+        
         [self stopTask:task];
+        NSError* error = nil;
+        [fmanager removeItemAtPath:task[@"file_path"] error:&error];
+    }
     [[self mutableArrayValueForKey:@"arr_queue"] removeObjectsInArray:tasks];
 }
 
 -(void) removeTask:(NSMutableDictionary*) task
 {
-    
+    NSFileManager* fmanager = [NSFileManager new];
     //    [self.arr_queue addObject:task];
     [self stopTask:task];
+    NSError* error = nil;
+    [fmanager removeItemAtPath:task[@"file_path"] error:&error];
+    
     [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];