|
|
@@ -126,222 +126,222 @@
|
|
|
|
|
|
repeat:
|
|
|
{
|
|
|
-
|
|
|
- // return [self fake_json:url];
|
|
|
-
|
|
|
- // AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
|
- //分界线的标识符
|
|
|
- NSString *TWITTERFON_FORM_BOUNDARY = @"AaB03x";
|
|
|
- //根据url初始化request
|
|
|
- NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]
|
|
|
- cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
|
|
|
- timeoutInterval:JSON_TIMEOUT];
|
|
|
- //分界线 --AaB03x
|
|
|
- NSString *MPboundary=[[NSString alloc]initWithFormat:@"--%@",TWITTERFON_FORM_BOUNDARY];
|
|
|
- //结束符 AaB03x--
|
|
|
- NSString *endMPboundary=[[NSString alloc]initWithFormat:@"%@--",MPboundary];
|
|
|
- //要上传的图片
|
|
|
- // UIImage *image=[params objectForKey:@"pic"];
|
|
|
- //得到图片的data
|
|
|
- // NSData* data = UIImagePNGRepresentation(image);
|
|
|
- //http body的字符串
|
|
|
- NSMutableString *body=[[NSMutableString alloc]init];
|
|
|
-
|
|
|
- // NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
|
|
|
- // [params setValue:@"handset_login" forKey:@"action"];
|
|
|
- // [headers setValue:[NSString stringWithFormat:@"%d",dataLength] forKey:@"Content-Length"];
|
|
|
-
|
|
|
- // [params setValue:appDelegate.sessionid forKey:@"sessionid"];
|
|
|
- // [params setValue:password forKey:@"password"];
|
|
|
- // [params setValue:[NSString stringWithFormat:@"%d",ver] forKey:@"auth_ver"];
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- // [headers setValue:headQuerlString forKey:@"param"];
|
|
|
-
|
|
|
- //参数的集合的所有key的集合
|
|
|
- NSArray *keys= [params allKeys];
|
|
|
- DebugLog(@"================parms==================");
|
|
|
- //遍历keys
|
|
|
- for(int i=0;i<[keys count];i++)
|
|
|
- {
|
|
|
- //得到当前key
|
|
|
- NSString *key=[keys objectAtIndex:i];
|
|
|
- //如果key不是pic，说明value是字符类型，比如name：Boris
|
|
|
- if(![key isEqualToString:@"pic"])
|
|
|
+
|
|
|
+ // return [self fake_json:url];
|
|
|
+
|
|
|
+ // AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
|
+ //分界线的标识符
|
|
|
+ NSString *TWITTERFON_FORM_BOUNDARY = @"AaB03x";
|
|
|
+ //根据url初始化request
|
|
|
+ NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]
|
|
|
+ cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
|
|
|
+ timeoutInterval:JSON_TIMEOUT];
|
|
|
+ //分界线 --AaB03x
|
|
|
+ NSString *MPboundary=[[NSString alloc]initWithFormat:@"--%@",TWITTERFON_FORM_BOUNDARY];
|
|
|
+ //结束符 AaB03x--
|
|
|
+ NSString *endMPboundary=[[NSString alloc]initWithFormat:@"%@--",MPboundary];
|
|
|
+ //要上传的图片
|
|
|
+ // UIImage *image=[params objectForKey:@"pic"];
|
|
|
+ //得到图片的data
|
|
|
+ // NSData* data = UIImagePNGRepresentation(image);
|
|
|
+ //http body的字符串
|
|
|
+ NSMutableString *body=[[NSMutableString alloc]init];
|
|
|
+
|
|
|
+ // NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
|
|
|
+ // [params setValue:@"handset_login" forKey:@"action"];
|
|
|
+ // [headers setValue:[NSString stringWithFormat:@"%d",dataLength] forKey:@"Content-Length"];
|
|
|
+
|
|
|
+ // [params setValue:appDelegate.sessionid forKey:@"sessionid"];
|
|
|
+ // [params setValue:password forKey:@"password"];
|
|
|
+ // [params setValue:[NSString stringWithFormat:@"%d",ver] forKey:@"auth_ver"];
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // [headers setValue:headQuerlString forKey:@"param"];
|
|
|
+
|
|
|
+ //参数的集合的所有key的集合
|
|
|
+ NSArray *keys= [params allKeys];
|
|
|
+ DebugLog(@"================parms==================");
|
|
|
+ //遍历keys
|
|
|
+ for(int i=0;i<[keys count];i++)
|
|
|
{
|
|
|
- //添加分界线，换行
|
|
|
- [body appendFormat:@"%@\r\n",MPboundary];
|
|
|
- //添加字段名称，换2行
|
|
|
- [body appendFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",key];
|
|
|
- //添加字段的值
|
|
|
- [body appendFormat:@"%@\r\n",[params objectForKey:key]];
|
|
|
- DebugLog(@"parameter: key=%@ value=%@",key,[params objectForKey:key]);
|
|
|
+ //得到当前key
|
|
|
+ NSString *key=[keys objectAtIndex:i];
|
|
|
+ //如果key不是pic，说明value是字符类型，比如name：Boris
|
|
|
+ if(![key isEqualToString:@"pic"])
|
|
|
+ {
|
|
|
+ //添加分界线，换行
|
|
|
+ [body appendFormat:@"%@\r\n",MPboundary];
|
|
|
+ //添加字段名称，换2行
|
|
|
+ [body appendFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",key];
|
|
|
+ //添加字段的值
|
|
|
+ [body appendFormat:@"%@\r\n",[params objectForKey:key]];
|
|
|
+ DebugLog(@"parameter: key=%@ value=%@",key,[params objectForKey:key]);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- DebugLog(@"================parms==================");
|
|
|
- ////添加分界线，换行
|
|
|
- [body appendFormat:@"%@\r\n",MPboundary];
|
|
|
- //声明pic字段，文件名为boris.png
|
|
|
- [body appendFormat:@"Content-Disposition: form-data; name=\"pic\"; filename=\"boris.png\"\r\n"];
|
|
|
- //声明上传文件的格式
|
|
|
- [body appendFormat:@"Content-Type: image/png\r\n\r\n"];
|
|
|
-
|
|
|
- //声明结束符：--AaB03x--
|
|
|
- NSString *end=[[NSString alloc]initWithFormat:@"\r\n%@",endMPboundary];
|
|
|
- //声明myRequestData，用来放入http body
|
|
|
- NSMutableData *myRequestData=[NSMutableData data];
|
|
|
- //将body字符串转化为UTF8格式的二进制
|
|
|
- [myRequestData appendData:[body dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
- //将image的data加入
|
|
|
- // [myRequestData appendData:data];
|
|
|
- //加入结束符--AaB03x--
|
|
|
- [myRequestData appendData:[end dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
-
|
|
|
- //设置HTTPHeader中Content-Type的值
|
|
|
- NSString *content=[[NSString alloc]initWithFormat:@"multipart/form-data; boundary=%@",TWITTERFON_FORM_BOUNDARY];
|
|
|
- //设置HTTPHeader
|
|
|
- [request setValue:content forHTTPHeaderField:@"Content-Type"];
|
|
|
-
|
|
|
- // 关闭keep alive
|
|
|
- [request setValue:@"close" forHTTPHeaderField:@"Connection"];
|
|
|
- //设置Content-Length
|
|
|
- [request setValue:[NSString stringWithFormat:@"%lu", (unsigned long)[myRequestData length]] forHTTPHeaderField:@"Content-Length"];
|
|
|
- //设置http body
|
|
|
- [request setHTTPBody:myRequestData];
|
|
|
- //http method
|
|
|
- [request setHTTPMethod:@"POST"];
|
|
|
-
|
|
|
-
|
|
|
- NSHTTPURLResponse* urlResponse = nil;
|
|
|
-
|
|
|
- NSError *error = nil;
|
|
|
-
|
|
|
- NSData *responseData = [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
|
|
|
-
|
|
|
-
|
|
|
- DebugLog(@"url: %@",url);
|
|
|
-
|
|
|
- DebugLog(@"response: %@",[NSHTTPURLResponse localizedStringForStatusCode:urlResponse.statusCode]);
|
|
|
-
|
|
|
- if (responseData==nil) {
|
|
|
-
|
|
|
- DebugLog(@"response error:%@", [error localizedDescription]);
|
|
|
-
|
|
|
+ DebugLog(@"================parms==================");
|
|
|
+ ////添加分界线，换行
|
|
|
+ [body appendFormat:@"%@\r\n",MPboundary];
|
|
|
+ //声明pic字段，文件名为boris.png
|
|
|
+ [body appendFormat:@"Content-Disposition: form-data; name=\"pic\"; filename=\"boris.png\"\r\n"];
|
|
|
+ //声明上传文件的格式
|
|
|
+ [body appendFormat:@"Content-Type: image/png\r\n\r\n"];
|
|
|
|
|
|
- NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];
|
|
|
- //#define RESULT_FALSE 0
|
|
|
- //#define RESULT_TRUE 2
|
|
|
- //#define RESULT_NET_ERROR -3
|
|
|
- //#define RESULT_NET_NOTAVAILABLE -4
|
|
|
- //#define RESULT_ERROR -5
|
|
|
- //#define RESULT_LOCALFILE_ERROR -7
|
|
|
- //#define RESULT_USERAUTH_ERROR -9
|
|
|
- //#define RESULT_UPDATE_USERAUTH_ERROR -11
|
|
|
- //#define RESULT_SESSION_EXPIRED -13
|
|
|
- //#define RESULT_VER_LOW
|
|
|
+ //声明结束符：--AaB03x--
|
|
|
+ NSString *end=[[NSString alloc]initWithFormat:@"\r\n%@",endMPboundary];
|
|
|
+ //声明myRequestData，用来放入http body
|
|
|
+ NSMutableData *myRequestData=[NSMutableData data];
|
|
|
+ //将body字符串转化为UTF8格式的二进制
|
|
|
+ [myRequestData appendData:[body dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
+ //将image的data加入
|
|
|
+ // [myRequestData appendData:data];
|
|
|
+ //加入结束符--AaB03x--
|
|
|
+ [myRequestData appendData:[end dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
|
|
|
- // NSString * moreinfo = error.description ;
|
|
|
+ //设置HTTPHeader中Content-Type的值
|
|
|
+ NSString *content=[[NSString alloc]initWithFormat:@"multipart/form-data; boundary=%@",TWITTERFON_FORM_BOUNDARY];
|
|
|
+ //设置HTTPHeader
|
|
|
+ [request setValue:content forHTTPHeaderField:@"Content-Type"];
|
|
|
|
|
|
- NSString* err_msg = [error localizedDescription];
|
|
|
+ // 关闭keep alive
|
|
|
+ [request setValue:@"close" forHTTPHeaderField:@"Connection"];
|
|
|
+ //设置Content-Length
|
|
|
+ [request setValue:[NSString stringWithFormat:@"%lu", (unsigned long)[myRequestData length]] forHTTPHeaderField:@"Content-Length"];
|
|
|
+ //设置http body
|
|
|
+ [request setHTTPBody:myRequestData];
|
|
|
+ //http method
|
|
|
+ [request setHTTPMethod:@"POST"];
|
|
|
|
|
|
|
|
|
- //-----------------retry 3 times for error code -1005------------------------
|
|
|
- if(error.code==-1005&&retry<3)
|
|
|
- {
|
|
|
- retry++;
|
|
|
- goto repeat;
|
|
|
-
|
|
|
- }
|
|
|
- //-----------------end retry 3 times for error code -1005------------------------
|
|
|
+ NSHTTPURLResponse* urlResponse = nil;
|
|
|
|
|
|
- NSDictionary* error_json = [RAUtils error_dict:error];
|
|
|
- [ret setObject:error_json forKey:@"err_obj"];
|
|
|
- NSString* resp_msg= nil;
|
|
|
+ NSError *error = nil;
|
|
|
|
|
|
- if(err_msg.length==0)
|
|
|
- {
|
|
|
- err_msg =[NSHTTPURLResponse localizedStringForStatusCode:urlResponse.statusCode];
|
|
|
- resp_msg = err_msg;
|
|
|
- }
|
|
|
- [ret setValue:[NSString stringWithFormat:@"%d",RESULT_NET_ERROR] forKey:@"result"];
|
|
|
- [ret setValue:err_msg forKey:@"err_msg"];
|
|
|
- [ret setValue:resp_msg forKey:@"resp_msg"];
|
|
|
- [ret setValue:[NSString stringWithFormat:@"%ld",(long)urlResponse.statusCode] forKey:@"resp_code"];
|
|
|
+ NSData *responseData = [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
|
|
|
|
|
|
|
|
|
- NSData *jsonData = [NSJSONSerialization dataWithJSONObject:ret
|
|
|
- options:0
|
|
|
- error:nil];
|
|
|
- if(![url isEqualToString:URL_ERR_LOG])
|
|
|
- {
|
|
|
- [iSalesNetwork err_log:[RAUtils base64en:[RAUtils dict2string:params]] result:[RAUtils base64en:[RAUtils dict2string:ret]] module:url code:RESULT_NET_ERROR];
|
|
|
- }
|
|
|
- return jsonData;
|
|
|
+ DebugLog(@"url: %@",url);
|
|
|
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- NSMutableString *str = [[NSMutableString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
|
|
|
-
|
|
|
- DebugLog(@"data string: %@",str);
|
|
|
- NSError *error1 = nil;
|
|
|
-
|
|
|
- NSMutableDictionary* jsobj = [[NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingMutableContainers error:&error1] mutableCopy];
|
|
|
+ DebugLog(@"response: %@",[NSHTTPURLResponse localizedStringForStatusCode:urlResponse.statusCode]);
|
|
|
|
|
|
- if(jsobj==nil)// 服务器返回不是json
|
|
|
- {
|
|
|
+ if (responseData==nil) {
|
|
|
|
|
|
- jsobj=[[NSMutableDictionary alloc] init];
|
|
|
- [jsobj setValue:@"1" forKey:@"result"];
|
|
|
+ DebugLog(@"response error:%@", [error localizedDescription]);
|
|
|
+
|
|
|
+
|
|
|
+ NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];
|
|
|
+ //#define RESULT_FALSE 0
|
|
|
+ //#define RESULT_TRUE 2
|
|
|
+ //#define RESULT_NET_ERROR -3
|
|
|
+ //#define RESULT_NET_NOTAVAILABLE -4
|
|
|
+ //#define RESULT_ERROR -5
|
|
|
+ //#define RESULT_LOCALFILE_ERROR -7
|
|
|
+ //#define RESULT_USERAUTH_ERROR -9
|
|
|
+ //#define RESULT_UPDATE_USERAUTH_ERROR -11
|
|
|
+ //#define RESULT_SESSION_EXPIRED -13
|
|
|
+ //#define RESULT_VER_LOW
|
|
|
+
|
|
|
+ // NSString * moreinfo = error.description ;
|
|
|
+
|
|
|
+ NSString* err_msg = [error localizedDescription];
|
|
|
+
|
|
|
+
|
|
|
+ //-----------------retry 3 times for error code -1005------------------------
|
|
|
+ if(error.code==-1005&&retry<3)
|
|
|
+ {
|
|
|
+ retry++;
|
|
|
+ goto repeat;
|
|
|
+
|
|
|
+ }
|
|
|
+ //-----------------end retry 3 times for error code -1005------------------------
|
|
|
+
|
|
|
+ NSDictionary* error_json = [RAUtils error_dict:error];
|
|
|
+ [ret setObject:error_json forKey:@"err_obj"];
|
|
|
+ NSString* resp_msg= nil;
|
|
|
+
|
|
|
+ if(err_msg.length==0)
|
|
|
+ {
|
|
|
+ err_msg =[NSHTTPURLResponse localizedStringForStatusCode:urlResponse.statusCode];
|
|
|
+ resp_msg = err_msg;
|
|
|
+ }
|
|
|
+ [ret setValue:[NSString stringWithFormat:@"%d",RESULT_NET_ERROR] forKey:@"result"];
|
|
|
+ [ret setValue:err_msg forKey:@"err_msg"];
|
|
|
+ [ret setValue:resp_msg forKey:@"resp_msg"];
|
|
|
+ [ret setValue:[NSString stringWithFormat:@"%ld",(long)urlResponse.statusCode] forKey:@"resp_code"];
|
|
|
+
|
|
|
+
|
|
|
+ NSData *jsonData = [NSJSONSerialization dataWithJSONObject:ret
|
|
|
+ options:0
|
|
|
+ error:nil];
|
|
|
+ if(![url isEqualToString:URL_ERR_LOG])
|
|
|
+ {
|
|
|
+ [iSalesNetwork err_log:[RAUtils base64en:[RAUtils dict2string:params]] result:[RAUtils base64en:[RAUtils dict2string:ret]] module:url code:RESULT_NET_ERROR];
|
|
|
+ }
|
|
|
+ return jsonData;
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- int result=[[jsobj valueForKey:@"result"] intValue];
|
|
|
- UIApplication * app = [UIApplication sharedApplication];
|
|
|
- AppDelegate *appDelegate = (AppDelegate *)[app delegate];
|
|
|
- NSString* mode =[jsobj valueForKey:@"mode"];
|
|
|
- [appDelegate SetMode:mode];
|
|
|
- switch (result) {
|
|
|
- case 0:
|
|
|
- [jsobj setValue:MSG_USERAUTH_ERROR forKey:@"err_msg"];
|
|
|
- break;
|
|
|
- case 1:
|
|
|
- [jsobj setValue:MSG_ERROR forKey:@"err_msg"];
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- [jsobj setValue:MSG_SUCCESS forKey:@"err_msg"];
|
|
|
- break;
|
|
|
- case 8:
|
|
|
- [jsobj setValue:[jsobj valueForKey:@"msg"] forKey:@"err_msg"];
|
|
|
- break;
|
|
|
- case 9:
|
|
|
- [jsobj setValue:[jsobj valueForKey:@"msg"] forKey:@"err_msg"];
|
|
|
- break;
|
|
|
- default:
|
|
|
- [jsobj setValue:MSG_ERROR forKey:@"err_msg"];
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- if([appDelegate.build intValue]< [[jsobj valueForKey:@"min_ver"]intValue])
|
|
|
- {
|
|
|
- [jsobj setValue:@"9" forKey:@"result"];
|
|
|
- [jsobj setValue:MSG_VER_LOW forKey:@"err_msg"];
|
|
|
- }
|
|
|
-
|
|
|
- if(![url isEqualToString:URL_ERR_LOG]&&![url isEqualToString:URL_DOWNLOAD_OFFLINE]/*&&result!=-3*/&&result!=2)
|
|
|
+ else
|
|
|
{
|
|
|
- [iSalesNetwork err_log:[RAUtils base64en:[RAUtils dict2string:params]] result:[RAUtils base64en:str] module:url code:result];
|
|
|
+ NSMutableString *str = [[NSMutableString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
|
|
|
+
|
|
|
+ DebugLog(@"data string: %@",str);
|
|
|
+ NSError *error1 = nil;
|
|
|
+
|
|
|
+ NSMutableDictionary* jsobj = [[NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingMutableContainers error:&error1] mutableCopy];
|
|
|
+
|
|
|
+ if(jsobj==nil)// 服务器返回不是json
|
|
|
+ {
|
|
|
+
|
|
|
+ jsobj=[[NSMutableDictionary alloc] init];
|
|
|
+ [jsobj setValue:@"1" forKey:@"result"];
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ int result=[[jsobj valueForKey:@"result"] intValue];
|
|
|
+ UIApplication * app = [UIApplication sharedApplication];
|
|
|
+ AppDelegate *appDelegate = (AppDelegate *)[app delegate];
|
|
|
+ NSString* mode =[jsobj valueForKey:@"mode"];
|
|
|
+ [appDelegate SetMode:mode];
|
|
|
+ switch (result) {
|
|
|
+ case 0:
|
|
|
+ [jsobj setValue:MSG_USERAUTH_ERROR forKey:@"err_msg"];
|
|
|
+ break;
|
|
|
+ case 1:
|
|
|
+ [jsobj setValue:MSG_ERROR forKey:@"err_msg"];
|
|
|
+ break;
|
|
|
+ case 2:
|
|
|
+ [jsobj setValue:MSG_SUCCESS forKey:@"err_msg"];
|
|
|
+ break;
|
|
|
+ case 8:
|
|
|
+ [jsobj setValue:[jsobj valueForKey:@"msg"] forKey:@"err_msg"];
|
|
|
+ break;
|
|
|
+ case 9:
|
|
|
+ [jsobj setValue:[jsobj valueForKey:@"msg"] forKey:@"err_msg"];
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ [jsobj setValue:MSG_ERROR forKey:@"err_msg"];
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ if([appDelegate.build intValue]< [[jsobj valueForKey:@"min_ver"]intValue])
|
|
|
+ {
|
|
|
+ [jsobj setValue:@"9" forKey:@"result"];
|
|
|
+ [jsobj setValue:MSG_VER_LOW forKey:@"err_msg"];
|
|
|
+ }
|
|
|
+
|
|
|
+ if(![url isEqualToString:URL_ERR_LOG]&&![url isEqualToString:URL_DOWNLOAD_OFFLINE]/*&&result!=-3*/&&result!=2)
|
|
|
+ {
|
|
|
+ [iSalesNetwork err_log:[RAUtils base64en:[RAUtils dict2string:params]] result:[RAUtils base64en:str] module:url code:result];
|
|
|
+ }
|
|
|
+ NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsobj
|
|
|
+ options:0
|
|
|
+ error:nil];
|
|
|
+ return jsonData;
|
|
|
+
|
|
|
}
|
|
|
- NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsobj
|
|
|
- options:0
|
|
|
- error:nil];
|
|
|
- return jsonData;
|
|
|
-
|
|
|
+ return responseData;
|
|
|
}
|
|
|
- return responseData;
|
|
|
-}
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -788,18 +788,20 @@ repeat:
|
|
|
[params setValue:order_code forKey:@"orderCode"];
|
|
|
// [params setValue:sourceid forKey:@"sourceid"];
|
|
|
// [params setValue:editor forKey:@"editor"];
|
|
|
+
|
|
|
+ NSData* json=nil;
|
|
|
if(appDelegate.offline_mode)
|
|
|
{
|
|
|
- return [OLDataProvider offline_notimpl];
|
|
|
+ json=[OLDataProvider offline_editorder:params];
|
|
|
+
|
|
|
}
|
|
|
- if(appDelegate.offline_mode)
|
|
|
+ else
|
|
|
{
|
|
|
- return [OLDataProvider offline_notimpl];
|
|
|
+ if(![self IsNetworkAvailable])
|
|
|
+ return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
|
|
|
+
|
|
|
+ json=[self get_json:URL_OPEN_ORDER parameters:params];
|
|
|
}
|
|
|
- if(![self IsNetworkAvailable])
|
|
|
- return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
|
|
|
-
|
|
|
- NSData* json=[self get_json:URL_OPEN_ORDER parameters:params];
|
|
|
if(json!=nil)
|
|
|
{
|
|
|
NSError *error=nil;
|
|
|
@@ -1100,7 +1102,7 @@ repeat:
|
|
|
|
|
|
json=[self get_json:URL_CUSTOMER_UPDATE parameters:params];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if(json!=nil)
|
|
|
{
|
|
|
NSError *error=nil;
|
|
|
@@ -1155,7 +1157,7 @@ repeat:
|
|
|
|
|
|
json=[self get_json:URL_CUSTOMER_SAVE parameters:params];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if(json!=nil)
|
|
|
{
|
|
|
NSError *error=nil;
|
|
|
@@ -1267,9 +1269,9 @@ repeat:
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if(![self IsNetworkAvailable])
|
|
|
- return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
|
|
|
-
|
|
|
+ if(![self IsNetworkAvailable])
|
|
|
+ return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
|
|
|
+
|
|
|
json =[self get_json:request_url parameters:params];
|
|
|
}
|
|
|
if(json!=nil)
|
|
|
@@ -1558,10 +1560,10 @@ repeat:
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if(![self IsNetworkAvailable])
|
|
|
- return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
|
|
|
-
|
|
|
- json=[self get_json:URL_ORDER_DETAIL parameters:params];
|
|
|
+ if(![self IsNetworkAvailable])
|
|
|
+ return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
|
|
|
+
|
|
|
+ json=[self get_json:URL_ORDER_DETAIL parameters:params];
|
|
|
}
|
|
|
if(json==nil)
|
|
|
return nil;
|
