no message

zhangxiaowen
1 parent 91503c88
Showing 7 changed files with 67 additions and 56 deletions
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Base/CNLiveBaseModel.m
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
CNLiveScioLive/Pages/Header/SystemMacro.h
CNLiveScioLive/Pages/Login/Controller/CNLiveLoginViewController.m
CNLiveScioLive/Pages/My/用户设置/Controller/CNLiveUserUpdateViewController.m
CNLiveScioLive/Pages/Tools/UserInformation/ZXWUserInformation.m
@@ -81,14 +81,14 @@
 - (void)setApplicationLanguage{
     //优先考虑本地存储语言
-    if ([UserDefaults objectForKey:Language_Local]) {
+    if ([User_Defaults objectForKey:Language_Local]) {
-        if ([[UserDefaults objectForKey:Language_Local] isEqualToString:@"en"]) {
+        if ([[User_Defaults objectForKey:Language_Local] isEqualToString:@"en"]) {
             self.lan = @"en";
             [IQKeyboardManager sharedManager].toolbarDoneBarButtonItemText = @"Done";
         }
-        if ([[UserDefaults objectForKey:Language_Local] isEqualToString:@"zh-Hans"]) {
+        if ([[User_Defaults objectForKey:Language_Local] isEqualToString:@"zh-Hans"]) {
             self.lan = @"zh-Hans";
             [IQKeyboardManager sharedManager].toolbarDoneBarButtonItemText = @"完成";
         }
@@ -38,6 +38,7 @@
          }
      }
       return [dic copy];
+     
  }
  //将可能存在model数组转化为普通数组
  - (id)arrayOrDicWithObject:(id)origin {
@@ -56,36 +57,38 @@
              } else {
                  //model
                  [array addObject:[self toDictionary]];
-                }
+                
              }
+            
+         }
+         return [array copy];
-             return [array copy];
-         
-             } else if ([origin isKindOfClass:[NSDictionary class]]) {
-                 //字典
-                 NSDictionary *originDic = (NSDictionary *)origin;
-                 NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-                 for (NSString *key in originDic.allKeys) {
-                 id object = [originDic objectForKey:key];
-                 
-                 if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]]) {
-                     //string , bool, int ,NSinteger
-                     [dic setObject:object forKey:key];
-                 
-                 } else if ([object isKindOfClass:[NSArray class]] || [object isKindOfClass:[NSDictionary class]]) {
-                     //数组或字典
-                     [dic setObject:[self arrayOrDicWithObject:object] forKey:key];
-                 
-                 } else {
-                     //model
-                     [dic setObject:[self toDictionary] forKey:key];
-                 }
-            }
-            return [dic copy];
-         
+     } else if ([origin isKindOfClass:[NSDictionary class]]) {
+         //字典
+         NSDictionary *originDic = (NSDictionary *)origin;
+         NSMutableDictionary *dic = [NSMutableDictionary dictionary];
+         for (NSString *key in originDic.allKeys) {
+             id object = [originDic objectForKey:key];
+             
+             if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]]) {
+                 //string , bool, int ,NSinteger
+                 [dic setObject:object forKey:key];
+             
+             } else if ([object isKindOfClass:[NSArray class]] || [object isKindOfClass:[NSDictionary class]]) {
+                 //数组或字典
+                 [dic setObject:[self arrayOrDicWithObject:object] forKey:key];
+             
+             } else {
+                 //model
+                 [dic setObject:[self toDictionary] forKey:key];
+             }
+           
          }
-     
-         return [NSNull null];
+         return [dic copy];
+         
      }
+     return [NSNull null];
+    
+ }
 @end
@@ -112,15 +112,15 @@
         //本地存储语言版本
         if (IS_CHINESE) {
             [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"en", nil] forKey:@"AppleLanguages"];
-            [UserDefaults setObject:@"en" forKey:Language_Local];
+            [User_Defaults setObject:@"en" forKey:Language_Local];
             self->_appDelegate.lan = @"en";
-            [UserDefaults synchronize];
+            [User_Defaults synchronize];
         }else{
             [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"zh-Hans", nil] forKey:@"AppleLanguages"];
-            [UserDefaults setObject:@"zh-Hans" forKey:Language_Local];
+            [User_Defaults setObject:@"zh-Hans" forKey:Language_Local];
             self->_appDelegate.lan =@"zh-Hans";
-            [UserDefaults synchronize];
+            [User_Defaults synchronize];
         }
         //站点信息
@@ -69,16 +69,24 @@
 /**
  *  系统方法
  */
-#define NOTIFICATION_CENTER                  [NSNotificationCenter defaultCenter]
-#define ApplicationDelegate                 ((AppDelegate *)[[UIApplication sharedApplication] delegate])
-#define kKeyWindowRootVC                    [[[UIApplication sharedApplication] keyWindow] rootViewController]
-#define NS_Bundle                           [NSBundle mainBundle]
-#define UserDefaults                        [NSUserDefaults standardUserDefaults]
-#define WS(weakSelf)                        __weak __typeof(&*self)weakSelf = self;
+#define WS(weakSelf)                         __weak __typeof(&*self)weakSelf = self;
+#define Notification_Center                  [NSNotificationCenter defaultCenter]
+#define Application_Delegate                 ((AppDelegate *)[[UIApplication sharedApplication] delegate])
+#define KeyWindowRootController              [[[UIApplication sharedApplication] keyWindow] rootViewController]
+#define NS_Bundle                            [NSBundle mainBundle]
+#define User_Defaults                        [NSUserDefaults standardUserDefaults]
+
 #define LoginSuccessful                        @"LoginSuccessful"
 #define ExitSuccessful                         @"ExitSuccessful"
 #define GetCodeSuccessful                      @"GetCodeSuccessful"
+//图片
+#define Image(image)  [UIImage imageNamed:image]
+
+//字体
+#define Font(size)  [UIFont systemFontOfSize:size]
+#define BFont(size) [UIFont boldSystemFontOfSize:size]
+
 //颜色
 #define HEXCOLOR(c)                         [UIColor colorWithRed:((c>>16)&0xFF)/255.0 green:((c>>8)&0xFF)/255.0 blue:(c&0xFF)/255.0 alpha:1.0]
 #define HEXCOLORA(c,a)                      [UIColor colorWithRed:((c>>16)&0xFF)/255.0 green:((c>>8)&0xFF)/255.0 blue:(c&0xFF)/255.0 alpha:a]
@@ -22,10 +22,10 @@
 @implementation CNLiveLoginViewController
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
-    if([UserDefaults objectForKey:@"user_phone"] && [UserDefaults objectForKey:@"user_phone"] != nil && ![[UserDefaults objectForKey:@"user_phone"] isEqualToString:@""]){
-        _account.textField.text = [UserDefaults objectForKey:@"user_phone"];
-    }else if([UserDefaults objectForKey:@"user_email"] && [UserDefaults objectForKey:@"user_email"] != nil && ![[UserDefaults objectForKey:@"user_email"] isEqualToString:@""]){
-        _account.textField.text = [UserDefaults objectForKey:@"user_email"];
+    if([User_Defaults objectForKey:@"user_phone"] && [User_Defaults objectForKey:@"user_phone"] != nil && ![[User_Defaults objectForKey:@"user_phone"] isEqualToString:@""]){
+        _account.textField.text = [User_Defaults objectForKey:@"user_phone"];
+    }else if([User_Defaults objectForKey:@"user_email"] && [User_Defaults objectForKey:@"user_email"] != nil && ![[User_Defaults objectForKey:@"user_email"] isEqualToString:@""]){
+        _account.textField.text = [User_Defaults objectForKey:@"user_email"];
     }
 }
 - (void)viewDidLoad {
@@ -114,8 +114,8 @@
             make.height.offset(40);
         }];
-        if([UserDefaults objectForKey:@"user_phone"] && [UserDefaults objectForKey:@"user_phone"] != nil && ![[UserDefaults objectForKey:@"user_phone"] isEqualToString:@""]){
-            _account.textField.text = [UserDefaults objectForKey:@"user_phone"];
+        if([User_Defaults objectForKey:@"user_phone"] && [User_Defaults objectForKey:@"user_phone"] != nil && ![[User_Defaults objectForKey:@"user_phone"] isEqualToString:@""]){
+            _account.textField.text = [User_Defaults objectForKey:@"user_phone"];
         }
         _pwd = [[CNLiveLoginInputView alloc] initWithPic:@"cnlive_phone_message" placeholder:CustomStr(@"Code") type:CNLiveButtonTypeCode];
@@ -149,8 +149,8 @@
             make.height.offset(40);
         }];
-        if([UserDefaults objectForKey:@"user_email"] && [UserDefaults objectForKey:@"user_email"] != nil && ![[UserDefaults objectForKey:@"user_email"] isEqualToString:@""]){
-            _account.textField.text = [UserDefaults objectForKey:@"user_email"];
+        if([User_Defaults objectForKey:@"user_email"] && [User_Defaults objectForKey:@"user_email"] != nil && ![[User_Defaults objectForKey:@"user_email"] isEqualToString:@""]){
+            _account.textField.text = [User_Defaults objectForKey:@"user_email"];
         }
         [sureButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self->_account.mas_bottom).with.offset(20);
@@ -169,15 +169,15 @@ static ZXWUserInformation *_instance = nil;
     self.user_pwd = nil;
     self.user_email = nil;
-    [UserDefaults setObject:nil forKey:@"token"];
-    [UserDefaults setObject:nil forKey:@"user_id"];
-    [UserDefaults setObject:nil forKey:@"user_phone"];
-    [UserDefaults setObject:nil forKey:@"user_headimg"];
-    [UserDefaults setObject:nil forKey:@"user_name"];
-    [UserDefaults setObject:nil forKey:@"user_pwd"];
-    [UserDefaults setObject:nil forKey:@"user_email"];
+    [User_Defaults setObject:nil forKey:@"token"];
+    [User_Defaults setObject:nil forKey:@"user_id"];
+    [User_Defaults setObject:nil forKey:@"user_phone"];
+    [User_Defaults setObject:nil forKey:@"user_headimg"];
+    [User_Defaults setObject:nil forKey:@"user_name"];
+    [User_Defaults setObject:nil forKey:@"user_pwd"];
+    [User_Defaults setObject:nil forKey:@"user_email"];
-    [UserDefaults synchronize];
+    [User_Defaults synchronize];
     [[NSNotificationCenter defaultCenter] postNotificationName:ExitSuccessful object:nil];
 }