1.工作

UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -13,6 +13,8 @@
 		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 */; };
+		9948171722785013007C7CEA /* YRWorkTabCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9948171622785013007C7CEA /* YRWorkTabCell.m */; };
+		9948171A22785044007C7CEA /* YRWorkCollCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9948171922785044007C7CEA /* YRWorkCollCell.m */; };
 		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 */; };
@@ -137,6 +139,10 @@
 		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>"; };
+		9948171522785013007C7CEA /* YRWorkTabCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRWorkTabCell.h; sourceTree = "<group>"; };
+		9948171622785013007C7CEA /* YRWorkTabCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRWorkTabCell.m; sourceTree = "<group>"; };
+		9948171822785044007C7CEA /* YRWorkCollCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRWorkCollCell.h; sourceTree = "<group>"; };
+		9948171922785044007C7CEA /* YRWorkCollCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRWorkCollCell.m; 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>"; };
@@ -641,6 +647,10 @@
 		99C6FEAC2276942900C7070A /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				9948171522785013007C7CEA /* YRWorkTabCell.h */,
+				9948171622785013007C7CEA /* YRWorkTabCell.m */,
+				9948171822785044007C7CEA /* YRWorkCollCell.h */,
+				9948171922785044007C7CEA /* YRWorkCollCell.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1217,7 +1227,9 @@
 				99C6FE8F22768EC000C7070A /* AppDelegate.m in Sources */,
 				99F4A7432277D332009AA6ED /* YRCountDownView.m in Sources */,
 				99C6FEBA2276950C00C7070A /* YRMainVC.m in Sources */,
+				9948171A22785044007C7CEA /* YRWorkCollCell.m in Sources */,
 				27029BC72276A23400D53A94 /* YRLoginVC.m in Sources */,
+				9948171722785013007C7CEA /* YRWorkTabCell.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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

@@ -51,7 +51,11 @@
         
         if (!error) {
             
+            NSDictionary *resDic = response.mj_keyValues;
+            
             [YRUserInfo shareManager].token = response.authedToken.token;
+            [YRUserInfo shareManager].userInfo = resDic;
+            
             self.completed(YES);
             
         }else{

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

@@ -7,9 +7,7 @@
 //
 
 #import "YRMsgVC.h"
-#import <GRPCClient/GRPCCall+Tests.h>
 #import <UU_Ent/Message.pbrpc.h>
-#import <UU_Ent/Account.pbrpc.h>
 #import "YRUserInfo.h"
 #import "YRMsgMainModel.h"
 #import "YRMsgMainCell.h"
@@ -165,7 +163,6 @@
             
             VC = [YRBaseVC new];
     
-            
         }
         
         VC.title = model.name;

UU_Ent/UU_Ent/Modules/Mine/Main/Others/YRUserInfo.h

@@ -20,6 +20,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property(copy,nonatomic)NSString *token;
 
 
+/**
+ 登录返回的账户所有信息
+ */
+@property(strong,nonatomic)NSDictionary *userInfo;
+
+
 @end
 
 NS_ASSUME_NONNULL_END

UU_Ent/UU_Ent/Modules/Work/Main/Controllers/YRWorkVC.m

@@ -8,7 +8,11 @@
 
 #import "YRWorkVC.h"
 
-@interface YRWorkVC ()
+@interface YRWorkVC ()<UITableViewDelegate,UITableViewDataSource>
+
+@property(strong,nonatomic)YRTableView *tableView;
+
+@property(strong,nonatomic)NSMutableArray *dataArr;
 
 @end
 
@@ -20,4 +24,106 @@
     self.title = @"工作";
 }
 
+-(void)setUpUI{
+    
+    [self.view addSubview:self.tableView];
+    self.tableView.frame = CGRectMake(10, 74, self.view.frame.size.width-20, kHeight - 108);
+    
+}
+
+#pragma mark - tableView Delegate && datasource
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    
+    return self.dataArr.count;
+    
+}
+
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    
+    return 1;
+    
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    
+    if (section == 0) {
+        
+        return 0;
+        
+    }else{
+        
+        return 10;
+        
+    }
+    
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    
+    return (int)((float)(self.dataArr.count/4.0) + 0.99) * 80 + 32;
+    
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    
+    return CGFLOAT_MIN;
+    
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    
+    UIView *header = [UIView new];
+    
+    return header;
+    
+}
+
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    UITableViewCell  *cell = [tableView dequeueReusableCellWithIdentifier:@"CornerCellReid"];
+    
+    if (!cell) {
+        
+        cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CornerCellReid"];
+        
+    }
+    
+    
+    return cell;
+    
+}
+
+#pragma mark - lazy
+
+-(UITableView *)tableView{
+    
+    if (!_tableView) {
+        
+        _tableView = [[YRTableView alloc]initWithFrame:CGRectZero style:UITableViewStylePlain];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.bounces = YES;
+        _tableView.layer.cornerRadius = 8;
+        _tableView.layer.masksToBounds = YES;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.backgroundColor = [UIColor clearColor];
+        _tableView.estimatedRowHeight = 0;
+        
+    }
+    
+    return _tableView;
+    
+}
+
+-(NSMutableArray *)dataArr{
+    
+    if (!_dataArr) {
+        
+        _dataArr = [NSMutableArray array];
+        
+    }
+    return _dataArr;
+}
+
 @end

UU_Ent/UU_Ent/Modules/Work/Main/Views/YRWorkCollCell.h

@@ -0,0 +1,17 @@
+//
+//  YRWorkCollCell.h
+//  UU_Ent
+//
+//  Created by liujl on 2019/4/30.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YRWorkCollCell : UICollectionViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

UU_Ent/UU_Ent/Modules/Work/Main/Views/YRWorkCollCell.m

@@ -0,0 +1,163 @@
+//
+//  YRWorkCollCell.m
+//  UU_Ent
+//
+//  Created by liujl on 2019/4/30.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import "YRWorkCollCell.h"
+
+@interface  YRWorkCollCell()
+
+@property(strong,nonatomic)UIImageView *iconView;
+
+@property(strong,nonatomic)UILabel *titleLabel;
+
+@property(strong,nonatomic)UIImageView *selectView;
+
+@property(strong,nonatomic)NSMutableArray *borderArr;
+
+@end
+
+@implementation YRWorkCollCell
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        [self createUI];
+        
+    }
+    return self;
+}
+
+-(void)createUI{
+    
+    [self.contentView addSubview:self.iconView];
+    
+    [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.top.equalTo(self.contentView).offset(24);
+        make.centerX.equalTo(self.contentView);
+        make.width.height.mas_equalTo(20);
+    }];
+    
+    [self.contentView addSubview:self.titleLabel];
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.iconView.mas_bottom).offset(10);
+        make.left.right.equalTo(self.contentView);
+        make.height.mas_equalTo(20);
+    }];
+    
+    [self.contentView addSubview:self.selectView];
+    
+    [self.selectView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.contentView).offset(7);
+        make.right.equalTo(self.contentView).offset(-7);
+        make.width.height.mas_equalTo(16);
+        
+    }];
+    
+    self.borderArr = [NSMutableArray array];
+    
+    UIView *topView = [UIView new];
+    topView.backgroundColor = HexColor(@"#DBDCDD");
+    
+    UIView *leftView = [UIView new];
+    leftView.backgroundColor = HexColor(@"#DBDCDD");
+    
+    UIView *bottomView = [UIView new];
+    bottomView.backgroundColor = HexColor(@"#DBDCDD");
+    
+    UIView *rightView = [UIView new];
+    rightView.backgroundColor = HexColor(@"#DBDCDD");
+    
+    [self.borderArr addObjectsFromArray:@[topView,leftView,bottomView,rightView]];
+    [self.contentView addSubview:topView];
+    [self.contentView addSubview:leftView];
+    [self.contentView addSubview:bottomView];
+    [self.contentView addSubview:rightView];
+    [topView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.right.equalTo(self.contentView);
+        make.height.mas_equalTo(0.3);
+    }];
+    [leftView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.bottom.equalTo(self.contentView);
+        make.width.mas_equalTo(0.3);
+    }];
+    [bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.bottom.right.equalTo(self.contentView);
+        make.height.mas_equalTo(0.3);
+    }];
+    [rightView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.right.bottom.equalTo(self.contentView);
+        make.width.mas_equalTo(0.3);
+    }];
+    
+}
+
+-(void)setShouldHidden:(BOOL)shouldHidden{
+    
+    self.selectView.hidden = shouldHidden;
+    for (UIView *view in self.borderArr) {
+        
+        view.hidden = YES;
+        
+    }
+}
+
+-(void)selectedOrNot{
+    
+    //    self.model.isSelected = !self.model.isSelected;
+    //
+    //    if (self.selectedBlock) {
+    //
+    //        self.selectedBlock(self.model);
+    //
+    //    }
+    
+}
+
+#pragma mark - lazy
+-(UIImageView *)iconView{
+    if (!_iconView) {
+        
+        _iconView = [[UIImageView alloc]init];
+        
+        
+    }
+    
+    return _iconView;
+}
+
+-(UILabel *)titleLabel{
+    if (!_titleLabel) {
+        _titleLabel = [UILabel new];
+        
+        _titleLabel.textAlignment = NSTextAlignmentCenter;
+        
+    }
+    //    _titleLabel.verticalAlignment = NSTextVerticalAlignmentTop;
+    //    _titleLabel.lineBreakMode = NSLineBreakByCharWrapping;
+    //    _titleLabel.numberOfLines = 2;
+//    _titleLabel.font = FONT_SIZE(13);
+    return _titleLabel;
+}
+
+-(UIImageView *)selectView{
+    if (!_selectView) {
+        _selectView = [UIImageView new];
+        _selectView.userInteractionEnabled = YES;
+//        _selectView.target = self;
+//        _selectView.aSelector = @selector(selectedOrNot);
+        
+    }
+    
+    return _selectView;
+    
+}
+
+
+@end

UU_Ent/UU_Ent/Modules/Work/Main/Views/YRWorkTabCell.h

@@ -0,0 +1,17 @@
+//
+//  YRWorkTabCell.h
+//  UU_Ent
+//
+//  Created by liujl on 2019/4/30.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YRWorkTabCell : UITableViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

UU_Ent/UU_Ent/Modules/Work/Main/Views/YRWorkTabCell.m

@@ -0,0 +1,292 @@
+//
+//  YRWorkTabCell.m
+//  UU_Ent
+//
+//  Created by liujl on 2019/4/30.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import "YRWorkTabCell.h"
+#import "YRWorkCollCell.h"
+
+@interface YRWorkTabCell()<UICollectionViewDelegate,UICollectionViewDataSource>
+
+@property(strong,nonatomic)UIView *header;
+
+@property(strong,nonatomic)UILabel *titleLabel;
+
+@property(strong,nonatomic)UICollectionView *collView;
+
+@end
+
+@implementation YRWorkTabCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+    
+    if ([super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        
+        [self setUpUI];
+        
+    }
+    
+    
+    return self;
+    
+}
+
+-(void)setUpUI{
+    
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
+    
+    self.layer.cornerRadius = 10;
+    
+    self.layer.masksToBounds = YES;
+    
+    [self.contentView addSubview:self.header];
+    
+    [self.header mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.top.equalTo(self.contentView).offset(8);
+        make.width.mas_equalTo(6);
+        make.left.equalTo(self.contentView);
+        make.height.mas_equalTo(16);
+        
+        
+    }];
+    
+    [self.contentView addSubview:self.titleLabel];
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.top.equalTo(self.header);
+        make.left.equalTo(self.header.mas_right).offset(3);
+        make.height.equalTo(self.header);
+        make.right.equalTo(self.contentView);
+        
+    }];
+    
+    [self.contentView addSubview:self.collView];
+    
+    [self.collView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.right.equalTo(self.contentView);
+        make.top.equalTo(self.header.mas_bottom);
+        make.bottom.equalTo(self.contentView).offset(-8);
+        
+    }];
+    
+    
+}
+
+
+
+-(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{
+    
+    return 1;
+    
+}
+
+-(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
+    
+    
+    return 3;
+    
+}
+
+-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    
+   
+    
+}
+
+-(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
+    
+    
+    YRWorkCollCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"YRWorkCollCellReid" forIndexPath:indexPath];
+    
+   
+    
+    return cell;
+    
+}
+
+-(BOOL)collectionView:(UICollectionView *)collectionView canMoveItemAtIndexPath:(NSIndexPath *)indexPath{
+    
+    return YES;
+    
+}
+
+-(UICollectionView *)collView{
+    
+    if (!_collView) {
+        
+        UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc]init];
+        
+        flowLayout.itemSize = CGSizeMake(([UIScreen mainScreen].bounds.size.width - 20)/4, 80);
+        
+        flowLayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+        flowLayout.minimumLineSpacing = 0;
+        flowLayout.minimumInteritemSpacing = 0;
+        
+        _collView = [[UICollectionView alloc]initWithFrame:CGRectZero collectionViewLayout:flowLayout];
+        
+        _collView.delegate = self;
+        _collView.dataSource = self;
+        _collView.scrollEnabled = NO;
+        
+        //        UILongPressGestureRecognizer *longGes = [[UILongPressGestureRecognizer alloc]initWithTarget:self action:@selector(longTouchBegin:)];
+        //        [_collView addGestureRecognizer:longGes];
+        
+        _collView.backgroundColor = [UIColor whiteColor];
+        [_collView registerClass:[YRWorkCollCell class] forCellWithReuseIdentifier:@"YRWorkCollCellReid"];
+        
+    }
+    
+    
+    return _collView;
+    
+}
+
+
+-(void)longTouchBegin:(UILongPressGestureRecognizer *)longGes{
+    
+//    if (self.moveBegin) {
+//
+//        CGPoint point = [longGes locationInView:self.collView];
+//
+//        NSIndexPath *indexpath = [self.collView indexPathForItemAtPoint:point];
+//
+//        UASWorkMainCell *cell = (UASWorkMainCell *)[self.collView cellForItemAtIndexPath:indexpath];
+//
+//        self.moveBegin(longGes,cell,self.collView,self.section);
+//
+//    }
+//
+//    switch (longGes.state) {
+//        case UIGestureRecognizerStateBegan:{
+//
+//            CGPoint point = [longGes locationInView:self.collView];
+//
+//            NSIndexPath *indexpath = [self.collView indexPathForItemAtPoint:point];
+//
+//            [self.collView beginInteractiveMovementForItemAtIndexPath:indexpath];
+//
+//
+//        }
+//
+//            break;
+//
+//        case UIGestureRecognizerStateChanged:{
+//
+//            CGPoint point = [longGes locationInView:self.collView];
+//
+//            self.imageView.center = point;
+//
+//            [self.collView updateInteractiveMovementTargetPosition:point];
+//
+//
+//        }
+//
+//            break;
+//        case UIGestureRecognizerStateEnded:{
+//
+//
+//            [self.collView endInteractiveMovement];
+//
+//
+//        }
+//
+//            break;
+//
+//
+//        case UIGestureRecognizerStateCancelled:{
+//
+//            [self.collView endInteractiveMovement];
+//
+//
+//        }
+//
+//
+//            break;
+//
+//
+//        case UIGestureRecognizerStatePossible:{
+//
+//
+//            break;
+//
+//        }
+//            break;
+//        default:
+//            break;
+//    }
+//
+//
+}
+
+- (void)collectionView:(UICollectionView *)collectionView moveItemAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath*)destinationIndexPath{
+    
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        
+//        if (sourceIndexPath.row < destinationIndexPath.row) {
+//            //终点cell之前的元素前移
+//            for (NSInteger i = sourceIndexPath.row; i<destinationIndexPath.row; i++) {
+//                
+//                UASWorkMainModel *temp = self.secModel.modelArr[i];
+//                self.secModel.modelArr[i] = self.secModel.modelArr[i+1];
+//                self.secModel.modelArr[i+1] = temp;
+//                
+//            }
+//            
+//            
+//        }else{
+//            
+//            for (NSInteger i = sourceIndexPath.row; i>destinationIndexPath.row; i--) {
+//                
+//                UASWorkMainModel *temp = self.secModel.modelArr[i];
+//                self.secModel.modelArr[i] = self.secModel.modelArr[i-1];
+//                self.secModel.modelArr[i-1] = temp;
+//                
+//            }
+//            
+//            
+//        }
+//        
+//        [self.collView reloadData];
+//        
+//        
+//        
+//    });
+    
+    
+    
+}
+
+
+-(UILabel *)titleLabel{
+    
+    if (!_titleLabel) {
+        
+        _titleLabel = [UILabel new];
+        _titleLabel.backgroundColor = [UIColor whiteColor];
+        _titleLabel.textAlignment = NSTextAlignmentLeft;
+        
+    }
+    
+    return _titleLabel;
+    
+}
+
+-(UIView *)header{
+    
+    if (!_header) {
+        
+        _header =[[UIView alloc]init];
+        
+        _header.backgroundColor = [UIColor blackColor];
+        
+    }
+    
+    return _header;
+    
+}
+@end

UU_Ent/UU_Ent/Supporting Files/Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>

UU_Ent/UU_Ent/Supporting Files/defines/common.h

@@ -10,6 +10,6 @@
 #define common_h
 #import <UIKit/UIKit.h>
 
-static NSString * const kHostAddress = @"10.1.81.83:9620";
+static NSString * const kHostAddress = @"uu-api-test.usoftchina.com:9620";
 
 #endif /* common_h */

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

@@ -17,6 +17,7 @@
 #import "YRTableView.h"
 
 //第三方导入
+#import <GRPCClient/GRPCCall+Tests.h>
 #import <Masonry/Masonry.h>
 #import <MJExtension/MJExtension.h>
 #import <IQKeyboardManager/IQKeyboardManager.h>

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

@@ -19,9 +19,14 @@
 #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)]
 
+//屏幕的宽高度
+#define kWidth [UIScreen mainScreen].bounds.size.width
+#define kHeight [UIScreen mainScreen].bounds.size.height
+
 #endif /* macro_h */