|
@@ -42,7 +42,7 @@
|
|
|
{
|
|
|
BOOL canShareType;
|
|
|
|
|
|
- UIImageView *welcomeImageV;
|
|
|
+ UIImageView *welcomeImageV;//弃用
|
|
|
UIView* rightRedView;//
|
|
|
BOOL hadUploadTaskType;
|
|
|
BOOL hadDownloadTaskType;
|
|
@@ -92,30 +92,31 @@
|
|
|
make.height.mas_equalTo(280.0*AUTOSCALE);
|
|
|
}];
|
|
|
|
|
|
- NSString *welcomeImageStr = @"nas_welcome_cs";
|
|
|
- //欢迎
|
|
|
- //en-US 英文 ja-JP 日文
|
|
|
- NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
|
|
|
- NSLog(@"arLanguages:%@",arLanguages);
|
|
|
- ///获取设备当前地区的代码和APP语言环境
|
|
|
- NSString *languageCode = [NSLocale preferredLanguages][0];
|
|
|
-
|
|
|
- //目前支持 中文(简体 繁体) 英文 日语
|
|
|
- if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
|
|
|
- {
|
|
|
- welcomeImageStr = @"nas_welcome_cs";
|
|
|
- }
|
|
|
- else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
|
|
|
- {
|
|
|
- welcomeImageStr = @"nas_welcome_ct";
|
|
|
- }
|
|
|
- else{
|
|
|
- welcomeImageStr = @"nas_welcome_en";
|
|
|
- }
|
|
|
+// NSString *welcomeImageStr = @"nas_welcome_cs";
|
|
|
+// //欢迎
|
|
|
+// //en-US 英文 ja-JP 日文
|
|
|
+// NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
|
|
|
+// NSLog(@"arLanguages:%@",arLanguages);
|
|
|
+// ///获取设备当前地区的代码和APP语言环境
|
|
|
+// NSString *languageCode = [NSLocale preferredLanguages][0];
|
|
|
+//
|
|
|
+// //目前支持 中文(简体 繁体) 英文 日语
|
|
|
+// if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
|
|
|
+// {
|
|
|
+// welcomeImageStr = @"nas_welcome_cs";
|
|
|
+// }
|
|
|
+// else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
|
|
|
+// {
|
|
|
+// welcomeImageStr = @"nas_welcome_ct";
|
|
|
+// }
|
|
|
+// else{
|
|
|
+// welcomeImageStr = @"nas_welcome_en";
|
|
|
+// }
|
|
|
|
|
|
CGFloat imageTopY = 54.0;
|
|
|
welcomeImageV = [UIImageView new];
|
|
|
- welcomeImageV.image = [UIImage imageNamed:welcomeImageStr];
|
|
|
+ welcomeImageV.hidden = YES;
|
|
|
+ //welcomeImageV.image = [UIImage imageNamed:welcomeImageStr];
|
|
|
[self.view addSubview:welcomeImageV];
|
|
|
|
|
|
[welcomeImageV mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
@@ -125,6 +126,18 @@
|
|
|
make.height.mas_equalTo(24);
|
|
|
}];
|
|
|
|
|
|
+ UILabel *welcomelabel = [[UILabel alloc] init];
|
|
|
+ welcomelabel.text = NSLocalizedString(@"NAS_top_welcome_title",nil);
|
|
|
+ welcomelabel.textColor = [UIColor hwColor:@"#0A132B"];
|
|
|
+ welcomelabel.font = [UIFont boldSystemFontOfSize:18.0];
|
|
|
+ [self.view addSubview:welcomelabel];
|
|
|
+
|
|
|
+ [welcomelabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
+ make.top.mas_equalTo(imageTopY);
|
|
|
+ make.left.mas_equalTo(16);
|
|
|
+ make.width.mas_equalTo(210);
|
|
|
+ make.height.mas_equalTo(24);
|
|
|
+ }];
|
|
|
|
|
|
//添加按钮
|
|
|
UIButton *addButton = [[UIButton alloc] init];
|