1.首页路由配置表

UU_Ent/Podfile

@@ -18,7 +18,7 @@ target 'UU_Ent' do
     inherit! :search_paths
     # Pods for testing
   end
-
+  
   target 'UU_EntUITests' do
     inherit! :search_paths
     # Pods for testing

UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		27029BD0227709CC00D53A94 /* UIButton+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 27029BCE227709CC00D53A94 /* UIButton+Layout.m */; };
 		27029BD32277E16300D53A94 /* YRButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 27029BD22277E16300D53A94 /* YRButton.m */; };
 		3FE47A8D89A70D18F98B1E41 /* libPods-UU_EntUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F4F857DEEC69AEDCFACDFD51 /* libPods-UU_EntUITests.a */; };
+		9948171422783494007C7CEA /* msg_route.json in Resources */ = {isa = PBXBuildFile; fileRef = 9948171322783494007C7CEA /* msg_route.json */; };
 		99C6FE6122768B5C00C7070A /* UU_EntTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE6022768B5C00C7070A /* UU_EntTests.m */; };
 		99C6FE6C22768B5C00C7070A /* UU_EntUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE6B22768B5C00C7070A /* UU_EntUITests.m */; };
 		99C6FE8F22768EC000C7070A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE7E22768EC000C7070A /* AppDelegate.m */; };
@@ -133,6 +134,9 @@
 		49A8B37D50A80EFFD84620EC /* Pods-UU_EntTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_EntTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-UU_EntTests/Pods-UU_EntTests.release.xcconfig"; sourceTree = "<group>"; };
 		49D3F089EECE8E3EDF7D2E1C /* Pods-UU_EntUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_EntUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-UU_EntUITests/Pods-UU_EntUITests.release.xcconfig"; sourceTree = "<group>"; };
 		71B4DF45C8EC3368ACFC4193 /* Pods-UU_Ent.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_Ent.debug.xcconfig"; path = "Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent.debug.xcconfig"; sourceTree = "<group>"; };
+		994817112278281F007C7CEA /* macro.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = macro.h; sourceTree = "<group>"; };
+		994817122278290A007C7CEA /* import.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = import.h; sourceTree = "<group>"; };
+		9948171322783494007C7CEA /* msg_route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = msg_route.json; sourceTree = "<group>"; };
 		99C6FE4422768B5B00C7070A /* UU_Ent.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UU_Ent.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		99C6FE5C22768B5C00C7070A /* UU_EntTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UU_EntTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		99C6FE6022768B5C00C7070A /* UU_EntTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UU_EntTests.m; sourceTree = "<group>"; };
@@ -676,6 +680,7 @@
 		99C6FEB12276943B00C7070A /* Others */ = {
 			isa = PBXGroup;
 			children = (
+				9948171322783494007C7CEA /* msg_route.json */,
 			);
 			path = Others;
 			sourceTree = "<group>";
@@ -759,6 +764,8 @@
 			isa = PBXGroup;
 			children = (
 				99C6FF1D2276DF2700C7070A /* common.h */,
+				994817112278281F007C7CEA /* macro.h */,
+				994817122278290A007C7CEA /* import.h */,
 			);
 			path = defines;
 			sourceTree = "<group>";
@@ -1054,6 +1061,7 @@
 				99F4A81A2277D845009AA6ED /* loading18.png in Resources */,
 				99F4A80F2277D845009AA6ED /* loading44.png in Resources */,
 				99F4A8182277D845009AA6ED /* loading20.png in Resources */,
+				9948171422783494007C7CEA /* msg_route.json in Resources */,
 				99F4A8162277D845009AA6ED /* loading63.png in Resources */,
 				99F4A8122277D845009AA6ED /* loading25.png in Resources */,
 				99F4A83C2277D845009AA6ED /* loading21.png in Resources */,

UU_Ent/UU_Ent/Modules/App/AppDelegate.m

@@ -40,7 +40,7 @@
     
     [YRAdView startLoad].loadCompleted = ^{
         
-        NSLog(@"现在动画结束了");
+        DLog(@"现在动画结束了");
         
     };
     

UU_Ent/UU_Ent/Modules/Base/YRBaseNav.m

@@ -18,7 +18,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
-    self.navigationBar.tintColor = [UIColor redColor];
+    self.navigationBar.tintColor = [UIColor orangeColor];
     
 }
 

UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRLoginVC.m

@@ -10,7 +10,7 @@
 #import "YRUserInfo.h"
 #import <GRPCClient/GRPCCall+Tests.h>
 #import <UU_Ent/Account.pbrpc.h>
-
+#import <MBProgressHUD/MBProgressHUD.h>
 @interface YRLoginVC ()<UITextFieldDelegate>
 @property (nonatomic,strong) UIScrollView *scrollView;
 @property (nonatomic,strong) UITextField *passwordTF;
@@ -25,7 +25,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-
+   
 }
 
 #pragma mark --- 登录操作

UU_Ent/UU_Ent/Modules/Main/Main/Controllers/YRMainVC.m

@@ -41,7 +41,7 @@
     
     [self setValue:tarBar forKey:@"tabBar"];
     
-    self.tabBar.tintColor = [UIColor redColor];
+    self.tabBar.tintColor = HexColor(@"#1084D1");
 }
 
 

UU_Ent/UU_Ent/Modules/Message/Main/Controllers/YRMsgVC.m

@@ -62,6 +62,8 @@
             
             self.dataArr = [YRMsgMainModel mj_objectArrayWithKeyValuesArray:dict[@"configArray"]];
             
+            [self matchDestineVc];
+            
             [self.tableView reloadData];
             
         }else{//请求失败
@@ -78,6 +80,37 @@
     
 }
 
+/**
+ 匹配模型对应的下一个控制器
+ */
+-(void)matchDestineVc{
+    
+    NSString *path = [[NSBundle mainBundle]pathForResource:@"msg_route" ofType:@"json"];
+    
+    NSData *data = [[NSData alloc]initWithContentsOfFile:path];
+    
+    NSError *error = nil;
+    
+    NSDictionary *routeDic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:&error];
+    
+    NSArray *routeArr = routeDic[@"data"];
+    
+    for (YRMsgMainModel *model in self.dataArr) {
+        
+        for (NSDictionary *dic in routeArr) {
+            
+            if ([model.code isEqualToString:dic[@"code"]]) {
+                
+                model.desVC = dic[@"desVc"];
+                
+            }
+            
+        }
+        
+    }
+    
+}
+
 #pragma mark - delegate && dataSource
 
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
@@ -126,9 +159,16 @@
     
     if (model.viewType == 0) {//原生
         
-        YRBaseVC *VC = (YRBaseVC *)[[NSClassFromString(@"YRBaseVC") alloc]init];
+        YRBaseVC *VC = (YRBaseVC *)[[NSClassFromString(model.desVC) alloc]init];
+        
+        if (!VC) {//出现异常
+            
+            VC = [YRBaseVC new];
+    
+            
+        }
         
-        VC.title = @"通知公告";
+        VC.title = model.name;
         
         [self.navigationController pushViewController:VC animated:YES];
         

UU_Ent/UU_Ent/Modules/Message/Main/Models/YRMsgMainModel.h

@@ -57,6 +57,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(assign,nonatomic)NSUInteger viewType;
 
+/**
+ 跳转的控制器
+ */
+@property(copy,nonatomic)NSString *desVC;
 /**
  网页地址
  */

UU_Ent/UU_Ent/Modules/Message/Main/Others/msg_route.json

@@ -0,0 +1,18 @@
+{
+    "version":"1",
+    "data":[
+            {"title":"通知公告",
+            "svid":"300004",
+            "desVc": "YRBaseVC",
+            "code":"uas.notice",
+            "desc":"通知公告",
+            },
+            {"title":"邀请注册",
+             "svid":"300005",
+             "desVc": "YRWebVC",
+             "code":"uas.invitationToRegister",
+             "desc":"邀请注册",
+            },
+            ]
+    
+}

UU_Ent/UU_Ent/Modules/Message/Main/Views/YRMsgMainCell.m

@@ -16,7 +16,6 @@
 
 @property(strong,nonatomic)UILabel *subTitLabel;
 
-
 @end
 
 @implementation YRMsgMainCell
@@ -41,15 +40,15 @@
     
     [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.top.equalTo(self.contentView).offset(8);
+        make.top.equalTo(self.contentView).offset(16);
         make.left.equalTo(self.contentView).offset(18);
-        make.bottom.equalTo(self.contentView).offset(-8);
-        make.width.mas_equalTo(50);
+        make.bottom.equalTo(self.contentView).offset(-16);
+        make.width.mas_equalTo(34);
         
     }];
     
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.contentView).offset(10);
+        make.top.equalTo(self.contentView).offset(14);
         make.left.equalTo(self.iconView.mas_right).offset(10);
         make.height.mas_equalTo(20);
         make.right.equalTo(self.contentView).offset(-20);
@@ -57,9 +56,9 @@
     
     [self.subTitLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         
+        make.top.equalTo(self.titleLabel.mas_bottom).offset(6);
         make.height.mas_greaterThanOrEqualTo(@10);
         make.left.equalTo(self.iconView.mas_right).offset(10);
-        make.bottom.equalTo(self.iconView);
         make.right.equalTo(self.contentView).offset(-20);
     }];
     
@@ -80,7 +79,7 @@
     if (!_iconView) {
         
         _iconView = [[UIImageView alloc]init];
-        _iconView.backgroundColor = [UIColor redColor];
+       
         
     }
     
@@ -104,6 +103,8 @@
     if (!_subTitLabel) {
         
         _subTitLabel = [UILabel new];
+        _subTitLabel.font = [UIFont systemFontOfSize:11];
+        _subTitLabel.textColor = [UIColor grayColor];
         
     }
     

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -11,79 +11,58 @@
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "filename" : "Icon-Small-1.png",
+      "scale" : "1x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Icon-Small@2x-1.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Icon-Small@3x-1.png",
       "scale" : "3x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Icon-Spotlight-40@2x-1.png",
       "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Icon-Spotlight-40@3x-1.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-1.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "40x40",
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x-1.png",
+      "scale" : "3x"
     },
     {
       "idiom" : "ios-marketing",

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Mine/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Msg/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Msg/首页/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Msg/首页/icon_invitationToRegister.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_invitationToRegister.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_invitationToRegister@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_invitationToRegister@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Msg/首页/icon_notice.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_notice.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_notice@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_notice@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabContact_nor.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabContact_nor@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabContact_nor@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabContact_nor@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabContact_select.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabContact_select@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabContact_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabContact_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabMe_nor.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMe_nor@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMe_nor@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMe_nor@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabMe_select.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMe_select@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMe_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMe_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabMes_nor.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMes_nor@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMes_nor@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMes_nor@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabMes_select.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMes_select@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMes_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabMes_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabWork_nor.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabWork_nor@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabWork_nor@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabWork_nor@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Tabbar/UU_TabWork_select.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabWork_select@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabWork_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_TabWork_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Work/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/登录/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Supporting Files/Info.plist

@@ -5,9 +5,13 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>UU互联</string>
+	<string>UU</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>

UU_Ent/UU_Ent/Supporting Files/UU_Ent.pch

@@ -8,18 +8,11 @@
 
 #ifndef UU_Ent_pch
 #define UU_Ent_pch
+//常用定义
 #import "common.h"
-#import "UIColor+HexColor.h"
-#import "UIButton+Layout.h"
-#import "YRButton.h"
+//宏定义
+#import "macro.h"
+//公用文件导入
+#import "import.h"
 
-#import <Masonry/Masonry.h>
-#import <MJExtension/MJExtension.h>
-#import <IQKeyboardManager/IQKeyboardManager.h>
-#import "YRUserInfo.h"
-#import "YRTableView.h"
-
-#define self_width self.view.frame.size.width
-#define self_height self.view.frame.size.height
-#define HexColor(h) [UIColor colorWithHexString:(h)]
 #endif /* UU_Ent_pch */

UU_Ent/UU_Ent/Supporting Files/defines/import.h

@@ -0,0 +1,25 @@
+//
+//  import.h
+//  UU_Ent
+//
+//  Created by liujl on 2019/4/30.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#ifndef import_h
+#define import_h
+
+//自定义
+#import "UIColor+HexColor.h"
+#import "UIButton+Layout.h"
+#import "YRButton.h"
+#import "YRUserInfo.h"
+#import "YRTableView.h"
+
+//第三方导入
+#import <Masonry/Masonry.h>
+#import <MJExtension/MJExtension.h>
+#import <IQKeyboardManager/IQKeyboardManager.h>
+
+
+#endif /* import_h */

UU_Ent/UU_Ent/Supporting Files/defines/macro.h

@@ -0,0 +1,27 @@
+//
+//  macro.h
+//  UU_Ent
+//
+//  Created by liujl on 2019/4/30.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#ifndef macro_h
+#define macro_h
+
+//日志输出
+#ifdef DEBUG
+
+#define DLog(...) NSLog(__VA_ARGS__)
+
+#else
+
+#define DLog(...)
+
+#endif
+
+#define self_width self.view.frame.size.width
+#define self_height self.view.frame.size.height
+#define HexColor(h) [UIColor colorWithHexString:(h)]
+
+#endif /* macro_h */