iOS Team / ScioLive · Commits

Commit 03e8ea4ca24043ee89ab9208d1540e709904efc5

Authored by zhangxiaowen
1 parent 91503c88

no message

Inline Side-by-side
Showing 7 changed files with 67 additions and 56 deletions
CNLiveScioLive/AppDelegate.m
  View file @03e8ea4
... ... @@ -81,14 +81,14 @@
81 81 - (void)setApplicationLanguage{
82 82  
83 83 //优先考虑本地存储语言
84   - if ([UserDefaults objectForKey:Language_Local]) {
  84 + if ([User_Defaults objectForKey:Language_Local]) {
85 85  
86   - if ([[UserDefaults objectForKey:Language_Local] isEqualToString:@"en"]) {
  86 + if ([[User_Defaults objectForKey:Language_Local] isEqualToString:@"en"]) {
87 87 self.lan = @"en";
88 88 [IQKeyboardManager sharedManager].toolbarDoneBarButtonItemText = @"Done";
89 89 }
90 90  
91   - if ([[UserDefaults objectForKey:Language_Local] isEqualToString:@"zh-Hans"]) {
  91 + if ([[User_Defaults objectForKey:Language_Local] isEqualToString:@"zh-Hans"]) {
92 92 self.lan = @"zh-Hans";
93 93 [IQKeyboardManager sharedManager].toolbarDoneBarButtonItemText = @"完成";
94 94 }
... ...
CNLiveScioLive/Pages/Base/CNLiveBaseModel.m
  View file @03e8ea4
... ... @@ -38,6 +38,7 @@
38 38 }
39 39 }
40 40 return [dic copy];
  41 +
41 42 }
42 43 //将可能存在model数组转化为普通数组
43 44 - (id)arrayOrDicWithObject:(id)origin {
... ... @@ -56,36 +57,38 @@
56 57 } else {
57 58 //model
58 59 [array addObject:[self toDictionary]];
59   - }
  60 +
60 61 }
  62 +
  63 + }
  64 + return [array copy];
61 65  
62   - return [array copy];
63   -
64   - } else if ([origin isKindOfClass:[NSDictionary class]]) {
65   - //字典
66   - NSDictionary *originDic = (NSDictionary *)origin;
67   - NSMutableDictionary *dic = [NSMutableDictionary dictionary];
68   - for (NSString *key in originDic.allKeys) {
69   - id object = [originDic objectForKey:key];
70   -
71   - if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]]) {
72   - //string , bool, int ,NSinteger
73   - [dic setObject:object forKey:key];
74   -
75   - } else if ([object isKindOfClass:[NSArray class]] || [object isKindOfClass:[NSDictionary class]]) {
76   - //数组或字典
77   - [dic setObject:[self arrayOrDicWithObject:object] forKey:key];
78   -
79   - } else {
80   - //model
81   - [dic setObject:[self toDictionary] forKey:key];
82   - }
83   - }
84   - return [dic copy];
85   -
  66 + } else if ([origin isKindOfClass:[NSDictionary class]]) {
  67 + //字典
  68 + NSDictionary *originDic = (NSDictionary *)origin;
  69 + NSMutableDictionary *dic = [NSMutableDictionary dictionary];
  70 + for (NSString *key in originDic.allKeys) {
  71 + id object = [originDic objectForKey:key];
  72 +
  73 + if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]]) {
  74 + //string , bool, int ,NSinteger
  75 + [dic setObject:object forKey:key];
  76 +
  77 + } else if ([object isKindOfClass:[NSArray class]] || [object isKindOfClass:[NSDictionary class]]) {
  78 + //数组或字典
  79 + [dic setObject:[self arrayOrDicWithObject:object] forKey:key];
  80 +
  81 + } else {
  82 + //model
  83 + [dic setObject:[self toDictionary] forKey:key];
  84 + }
  85 +
86 86 }
87   -
88   - return [NSNull null];
  87 + return [dic copy];
  88 +
89 89 }
  90 + return [NSNull null];
  91 +
  92 + }
90 93  
91 94 @end
... ...
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
  View file @03e8ea4
... ... @@ -112,15 +112,15 @@
112 112 //本地存储语言版本
113 113 if (IS_CHINESE) {
114 114 [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"en", nil] forKey:@"AppleLanguages"];
115   - [UserDefaults setObject:@"en" forKey:Language_Local];
  115 + [User_Defaults setObject:@"en" forKey:Language_Local];
116 116 self->_appDelegate.lan = @"en";
117   - [UserDefaults synchronize];
  117 + [User_Defaults synchronize];
118 118  
119 119 }else{
120 120 [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"zh-Hans", nil] forKey:@"AppleLanguages"];
121   - [UserDefaults setObject:@"zh-Hans" forKey:Language_Local];
  121 + [User_Defaults setObject:@"zh-Hans" forKey:Language_Local];
122 122 self->_appDelegate.lan =@"zh-Hans";
123   - [UserDefaults synchronize];
  123 + [User_Defaults synchronize];
124 124  
125 125 }
126 126 //站点信息
... ...
CNLiveScioLive/Pages/Header/SystemMacro.h
  View file @03e8ea4
... ... @@ -69,16 +69,24 @@
69 69 /**
70 70 * 系统方法
71 71 */
72   -#define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter]
73   -#define ApplicationDelegate ((AppDelegate *)[[UIApplication sharedApplication] delegate])
74   -#define kKeyWindowRootVC [[[UIApplication sharedApplication] keyWindow] rootViewController]
75   -#define NS_Bundle [NSBundle mainBundle]
76   -#define UserDefaults [NSUserDefaults standardUserDefaults]
77   -#define WS(weakSelf) __weak __typeof(&*self)weakSelf = self;
  72 +#define WS(weakSelf) __weak __typeof(&*self)weakSelf = self;
  73 +#define Notification_Center [NSNotificationCenter defaultCenter]
  74 +#define Application_Delegate ((AppDelegate *)[[UIApplication sharedApplication] delegate])
  75 +#define KeyWindowRootController [[[UIApplication sharedApplication] keyWindow] rootViewController]
  76 +#define NS_Bundle [NSBundle mainBundle]
  77 +#define User_Defaults [NSUserDefaults standardUserDefaults]
  78 +
78 79 #define LoginSuccessful @"LoginSuccessful"
79 80 #define ExitSuccessful @"ExitSuccessful"
80 81 #define GetCodeSuccessful @"GetCodeSuccessful"
81 82  
  83 +//图片
  84 +#define Image(image) [UIImage imageNamed:image]
  85 +
  86 +//字体
  87 +#define Font(size) [UIFont systemFontOfSize:size]
  88 +#define BFont(size) [UIFont boldSystemFontOfSize:size]
  89 +
82 90 //颜色
83 91 #define HEXCOLOR(c) [UIColor colorWithRed:((c>>16)&0xFF)/255.0 green:((c>>8)&0xFF)/255.0 blue:(c&0xFF)/255.0 alpha:1.0]
84 92 #define HEXCOLORA(c,a) [UIColor colorWithRed:((c>>16)&0xFF)/255.0 green:((c>>8)&0xFF)/255.0 blue:(c&0xFF)/255.0 alpha:a]
... ...
CNLiveScioLive/Pages/Login/Controller/CNLiveLoginViewController.m
  View file @03e8ea4
... ... @@ -22,10 +22,10 @@
22 22 @implementation CNLiveLoginViewController
23 23 - (void)viewDidAppear:(BOOL)animated{
24 24 [super viewDidAppear:animated];
25   - if([UserDefaults objectForKey:@"user_phone"] && [UserDefaults objectForKey:@"user_phone"] != nil && ![[UserDefaults objectForKey:@"user_phone"] isEqualToString:@""]){
26   - _account.textField.text = [UserDefaults objectForKey:@"user_phone"];
27   - }else if([UserDefaults objectForKey:@"user_email"] && [UserDefaults objectForKey:@"user_email"] != nil && ![[UserDefaults objectForKey:@"user_email"] isEqualToString:@""]){
28   - _account.textField.text = [UserDefaults objectForKey:@"user_email"];
  25 + if([User_Defaults objectForKey:@"user_phone"] && [User_Defaults objectForKey:@"user_phone"] != nil && ![[User_Defaults objectForKey:@"user_phone"] isEqualToString:@""]){
  26 + _account.textField.text = [User_Defaults objectForKey:@"user_phone"];
  27 + }else if([User_Defaults objectForKey:@"user_email"] && [User_Defaults objectForKey:@"user_email"] != nil && ![[User_Defaults objectForKey:@"user_email"] isEqualToString:@""]){
  28 + _account.textField.text = [User_Defaults objectForKey:@"user_email"];
29 29 }
30 30 }
31 31 - (void)viewDidLoad {
... ...
CNLiveScioLive/Pages/My/用户设置/Controller/CNLiveUserUpdateViewController.m
  View file @03e8ea4
... ... @@ -114,8 +114,8 @@
114 114 make.height.offset(40);
115 115  
116 116 }];
117   - if([UserDefaults objectForKey:@"user_phone"] && [UserDefaults objectForKey:@"user_phone"] != nil && ![[UserDefaults objectForKey:@"user_phone"] isEqualToString:@""]){
118   - _account.textField.text = [UserDefaults objectForKey:@"user_phone"];
  117 + if([User_Defaults objectForKey:@"user_phone"] && [User_Defaults objectForKey:@"user_phone"] != nil && ![[User_Defaults objectForKey:@"user_phone"] isEqualToString:@""]){
  118 + _account.textField.text = [User_Defaults objectForKey:@"user_phone"];
119 119 }
120 120  
121 121 _pwd = [[CNLiveLoginInputView alloc] initWithPic:@"cnlive_phone_message" placeholder:CustomStr(@"Code") type:CNLiveButtonTypeCode];
... ... @@ -149,8 +149,8 @@
149 149 make.height.offset(40);
150 150  
151 151 }];
152   - if([UserDefaults objectForKey:@"user_email"] && [UserDefaults objectForKey:@"user_email"] != nil && ![[UserDefaults objectForKey:@"user_email"] isEqualToString:@""]){
153   - _account.textField.text = [UserDefaults objectForKey:@"user_email"];
  152 + if([User_Defaults objectForKey:@"user_email"] && [User_Defaults objectForKey:@"user_email"] != nil && ![[User_Defaults objectForKey:@"user_email"] isEqualToString:@""]){
  153 + _account.textField.text = [User_Defaults objectForKey:@"user_email"];
154 154 }
155 155 [sureButton mas_makeConstraints:^(MASConstraintMaker *make) {
156 156 make.top.equalTo(self->_account.mas_bottom).with.offset(20);
... ...
CNLiveScioLive/Pages/Tools/UserInformation/ZXWUserInformation.m
  View file @03e8ea4
... ... @@ -169,15 +169,15 @@ static ZXWUserInformation *_instance = nil;
169 169 self.user_pwd = nil;
170 170 self.user_email = nil;
171 171  
172   - [UserDefaults setObject:nil forKey:@"token"];
173   - [UserDefaults setObject:nil forKey:@"user_id"];
174   - [UserDefaults setObject:nil forKey:@"user_phone"];
175   - [UserDefaults setObject:nil forKey:@"user_headimg"];
176   - [UserDefaults setObject:nil forKey:@"user_name"];
177   - [UserDefaults setObject:nil forKey:@"user_pwd"];
178   - [UserDefaults setObject:nil forKey:@"user_email"];
  172 + [User_Defaults setObject:nil forKey:@"token"];
  173 + [User_Defaults setObject:nil forKey:@"user_id"];
  174 + [User_Defaults setObject:nil forKey:@"user_phone"];
  175 + [User_Defaults setObject:nil forKey:@"user_headimg"];
  176 + [User_Defaults setObject:nil forKey:@"user_name"];
  177 + [User_Defaults setObject:nil forKey:@"user_pwd"];
  178 + [User_Defaults setObject:nil forKey:@"user_email"];
179 179  
180   - [UserDefaults synchronize];
  180 + [User_Defaults synchronize];
181 181 [[NSNotificationCenter defaultCenter] postNotificationName:ExitSuccessful object:nil];
182 182  
183 183 }
... ...