登录添加字段

SLAiELTS/SLAiELTS/AppDelegate.mm

@@ -28,7 +28,7 @@
     NSString *userPhone = [[NSUserDefaults standardUserDefaults] objectForKey:@"SLUserPhone"];
     NSString *userPassword = [[NSUserDefaults standardUserDefaults] objectForKey:@"SLUserPassword"];
     if (userPassword.length) {
-        NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:@{@"phone" : userPhone, @"password" : userPassword, @"code" : @"0"}];
+        NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:@{@"phone" : userPhone, @"password" : userPassword, @"code" : @"0", @"deviceBrand" : @"iPhone", @"deviceModel" : [NSString deviceModel]}];
         [self cacheLoginWhit:parameter];
     }else {
         [self setLoginVcWithRootWindow];

SLAiELTS/SLAiELTS/Tool/Extensions/NSString+Category.h

@@ -212,5 +212,7 @@
 
 + (NSString *)getRandStringWithLength:(int)length;
 
++ (NSString*)deviceModel;
+
 @end
 

SLAiELTS/SLAiELTS/Tool/Extensions/NSString+Category.m

@@ -8,6 +8,7 @@
 
 #import "NSString+Category.h"
 #import <objc/runtime.h>
+#import <sys/utsname.h>
 @implementation NSString (Category)
 static char *MoneyConversion = "moneyConversion";
 
@@ -817,4 +818,64 @@ static char *MoneyConversion = "moneyConversion";
     return resultStr;
 }
 
++ (NSString*)deviceModel
+{
+    // 需要
+    struct utsname systemInfo;
+    uname(&systemInfo);
+    NSString * deviceString = [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
+    //iPhone
+    if ([deviceString isEqualToString:@"iPhone1,1"])    return @"iPhone 1G";
+    if ([deviceString isEqualToString:@"iPhone1,2"])    return @"iPhone 3G";
+    if ([deviceString isEqualToString:@"iPhone2,1"])    return @"iPhone 3GS";
+    if ([deviceString isEqualToString:@"iPhone3,1"])    return @"iPhone 4";
+    if ([deviceString isEqualToString:@"iPhone3,2"])    return @"Verizon iPhone 4";
+    if ([deviceString isEqualToString:@"iPhone4,1"])    return @"iPhone 4S";
+    if ([deviceString isEqualToString:@"iPhone5,1"])    return @"iPhone 5";
+    if ([deviceString isEqualToString:@"iPhone5,2"])    return @"iPhone 5";
+    if ([deviceString isEqualToString:@"iPhone5,3"])    return @"iPhone 5C";
+    if ([deviceString isEqualToString:@"iPhone5,4"])    return @"iPhone 5C";
+    if ([deviceString isEqualToString:@"iPhone6,1"])    return @"iPhone 5S";
+    if ([deviceString isEqualToString:@"iPhone6,2"])    return @"iPhone 5S";
+    if ([deviceString isEqualToString:@"iPhone7,1"])    return @"iPhone 6 Plus";
+    if ([deviceString isEqualToString:@"iPhone7,2"])    return @"iPhone 6";
+    if ([deviceString isEqualToString:@"iPhone8,1"])    return @"iPhone 6s";
+    if ([deviceString isEqualToString:@"iPhone8,2"])    return @"iPhone 6s Plus";
+    if ([deviceString isEqualToString:@"iPhone8,4"])    return @"iPhone SE";
+    if ([deviceString isEqualToString:@"iPhone9,1"])    return @"iPhone 7";
+    if ([deviceString isEqualToString:@"iPhone9,2"])    return @"iPhone 7 Plus";
+    if ([deviceString isEqualToString:@"iPhone10,1"])   return @"iPhone 8";
+    if ([deviceString isEqualToString:@"iPhone10,4"])   return @"iPhone 8";
+    if ([deviceString isEqualToString:@"iPhone10,2"])   return @"iPhone 8 Plus";
+    if ([deviceString isEqualToString:@"iPhone10,5"])   return @"iPhone 8 Plus";
+    if ([deviceString isEqualToString:@"iPhone10,3"])   return @"iPhone X";
+    if ([deviceString isEqualToString:@"iPhone10,6"])   return @"iPhone X";
+    if ([deviceString isEqualToString:@"iPhone11,8"])   return @"iPhone XR";
+    if ([deviceString isEqualToString:@"iPhone11,2"])   return @"iPhone XS";
+    if ([deviceString isEqualToString:@"iPhone11,4"])   return @"iPhone XS Max";
+    if ([deviceString isEqualToString:@"iPhone11,6"])   return @"iPhone XS Max";
+    if ([deviceString isEqualToString:@"iPhone12,1"])   return @"iPhone 11";
+    if ([deviceString isEqualToString:@"iPhone12,3"])   return @"iPhone 11 Pro";
+    if ([deviceString isEqualToString:@"iPhone12,5"])   return @"iPhone 11 Pro Max";
+    if ([deviceString isEqualToString:@"iPhone12,8"])   return @"iPhone SE";
+    
+    if ([deviceString isEqualToString:@"iPhone13,1"])   return @"iPhone 12 mini";
+    if ([deviceString isEqualToString:@"iPhone13,2"])   return @"iPhone 12";
+    if ([deviceString isEqualToString:@"iPhone13,3"])   return @"iPhone 12 Pro";
+    if ([deviceString isEqualToString:@"iPhone13,4"])   return @"iPhone 12 Pro Max";
+    
+    if ([deviceString isEqualToString:@"iPhone14,4"])   return @"iPhone 13 mini";
+    if ([deviceString isEqualToString:@"iPhone14,5"])   return @"iPhone 13";
+    if ([deviceString isEqualToString:@"iPhone14,2"])   return @"iPhone 13 Pro";
+    if ([deviceString isEqualToString:@"iPhone14,3"])   return @"iPhone 13 Pro Max";
+    if ([deviceString isEqualToString:@"iPhone14,6"])   return @"iPhone SE";
+
+    if ([deviceString isEqualToString:@"iPhone14,7"])   return @"iPhone 14";
+    if ([deviceString isEqualToString:@"iPhone14,8"])   return @"iPhone 14 Plus";
+    if ([deviceString isEqualToString:@"iPhone15,2"])   return @"iPhone 14 Pro";
+    if ([deviceString isEqualToString:@"iPhone15,3"])   return @"iPhone 14 Pro Max";
+    
+    return deviceString;
+}
+
 @end

SLAiELTS/SLAiELTS/ViewControllers/LoginVC/SLLoginVCViewController.m

@@ -100,7 +100,7 @@
         [ZFToast ShowWithMessage:@"请勾选协议"];
         return;
     }
-    NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:@{@"phone" : phoneStr, @"password" : codeStr, @"code" : @"0"}];
+    NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:@{@"phone" : phoneStr, @"password" : codeStr, @"code" : @"0", @"deviceBrand" : @"iPhone", @"deviceModel" : [NSString deviceModel]}];
     [[SLHttpCenter SharedInstance] postWithUrl:@"/api/Token/LoginApp" parameter:parameter success:^(id responseObject) {
         NSDictionary *dataDict = [responseObject objectForKey:@"data"];
         SLLoginInfo *loginModel = [SLLoginInfo mj_objectWithKeyValues:dataDict];

SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Views/IMMessageView/YMIMMessageCollectionView.m

@@ -235,7 +235,7 @@
                             NSString *bdUrl = [NSString stringWithFormat:@"https://aip.baidubce.com/rpc/2.0/mt/texttrans/v1?access_token=%@",accessToken];
                             NSDictionary *dict = @{@"q":model.sendText,
                                                    @"from":@"auto",
-                                                   @"to":@"en"};
+                                                   @"to":@"zh"};
                             [[SLHttpCenter SharedInstance] postWithUrl:bdUrl parameter:dict success:^(id responseObject) {
                                 NSDictionary *reslut = [responseObject objectForKey:@"result"];
                                 NSArray *arr = [reslut objectForKey:@"trans_result"];
@@ -368,7 +368,7 @@
 //}
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    if (self.scrollViewDidEnd && self.scrollViewOfsetY - scrollView.contentOffset.y > 15) {
+    if (self.scrollViewDidEnd && self.scrollViewOfsetY - scrollView.contentOffset.y > 10) {
         self.scrollViewDidEnd = NO;
         self.scrollViewOfsetY = 0.0f;
         [self.viewController.view endEditing:YES];