Ver Fonte

20170116

remove file upload from oldataprovider
offline upload add device id
Ray Zhang há 9 anos atrás
pai
commit
92c20eb9c9

+ 1 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.h

@@ -92,7 +92,7 @@
 // sync
 // sync
 +(NSArray*) enumOfflineOrder;
 +(NSArray*) enumOfflineOrder;
 +(NSDictionary*) prepareUpload:(NSArray*) arr_order;
 +(NSDictionary*) prepareUpload:(NSArray*) arr_order;
-+(void) uploadFile:(NSString*) file;
+//+(void) uploadFile:(NSString*) file;
 //  category filter, contact advanced search, item search, search,wishlist,
 //  category filter, contact advanced search, item search, search,wishlist,
 
 
 //+(NSDictionary*) model_img :(int)product_id;
 //+(NSDictionary*) model_img :(int)product_id;

+ 1 - 0
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -1670,6 +1670,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     
     
     return ret;
     return ret;
 }
 }
+
 +(void) uploadFile:(NSString*) file
 +(void) uploadFile:(NSString*) file
 {
 {
     NSData* data = [NSData dataWithContentsOfFile: file];
     NSData* data = [NSData dataWithContentsOfFile: file];

+ 11 - 0
RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -1182,6 +1182,17 @@ void UncaughtExceptionHandler(NSException *exception) {
         if(appDelegate.password!=nil)
         if(appDelegate.password!=nil)
             [params setValue:appDelegate.password forKey:@"password"];
             [params setValue:appDelegate.password forKey:@"password"];
         
         
+
+#if TARGET_IPHONE_SIMULATOR//模拟器
+        [params setValue:@"simulator_uuid" forKey:@"idfv"];
+#elif TARGET_OS_IPHONE//真机
+        UIDevice * dev = [UIDevice currentDevice];
+        NSUUID* uuid =dev.identifierForVendor;
+        [params setValue:uuid.UUIDString forKey:@"idfv"];
+#endif
+        
+        
+        
         
         
         NSMutableURLRequest *request = [serializer multipartFormRequestWithMethod:@"POST" URLString:URL_UPLOAD_OFFLINE parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
         NSMutableURLRequest *request = [serializer multipartFormRequestWithMethod:@"POST" URLString:URL_UPLOAD_OFFLINE parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
             [formData appendPartWithFileData:data name:@"upfile" fileName:[upfile lastPathComponent] mimeType:@"application/zip"];
             [formData appendPartWithFileData:data name:@"upfile" fileName:[upfile lastPathComponent] mimeType:@"application/zip"];