|
|
@@ -22,12 +22,20 @@
|
|
|
params = [NSMutableDictionary dictionary];
|
|
|
}
|
|
|
|
|
|
- NSString *user = RASingleton.sharedInstance.encryptUser;
|
|
|
- NSString *password = RASingleton.sharedInstance.encryptPassword;
|
|
|
+ NSString *user = params[@"name"];
|
|
|
+ if (!user) {
|
|
|
+ user = RASingleton.sharedInstance.encryptUser;
|
|
|
+ if (user) {
|
|
|
+ params[@"name"] = user;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- if (user.length && password.length) {
|
|
|
- [params setObject:user forKey:@"name"];
|
|
|
- [params setObject:password forKey:@"password"];
|
|
|
+ NSString *password = params[@"password"];
|
|
|
+ if (!password) {
|
|
|
+ password = RASingleton.sharedInstance.encryptPassword;
|
|
|
+ if (password) {
|
|
|
+ params[@"password"] = password;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
[params setObject:@"iOS" forKey:@"platform"];
|