iOS Team / CNLiveMineModule · Commits

Commit e00ecea527d7c8527ae8d13c0652b7b4d7154212

Authored by zhangxiaowen
1 parent 47cff8ae

no message

Inline Side-by-side
Showing 6 changed files with 15 additions and 13 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
  View file @e00ecea
... ... @@ -39,7 +39,6 @@ static const NSInteger kHEIGHT = 250;
39 39 @"titles":@[@"订单", @"待付款", @"待收货",@"待评价",@"售后"],
40 40 @"images":@[@"mine_order",@"mine_pending",@"mine_received",@"mine_evaluate",@"mine_refund"]
41 41 },
42   -
43 42 @{
44 43 @"name":@"常用工具",
45 44 @"style":@"2",
... ... @@ -54,7 +53,6 @@ static const NSInteger kHEIGHT = 250;
54 53 @"margin":@"10",
55 54 @"titles": @[@"电子票"],
56 55 @"images":@[@"mine_e-ticket"]
57   -
58 56 },
59 57 @{
60 58 @"name":@"大众体育",
... ... @@ -64,7 +62,6 @@ static const NSInteger kHEIGHT = 250;
64 62 @"titles": @[@"我的活动", @"我的记录"], @"images":@[@"mine_activity",@"mine_record"]
65 63  
66 64 }
67   -
68 65 ];
69 66 for(NSDictionary *dic in data){
70 67 [self.data addObject:[CNLiveMineModel mj_objectWithKeyValues:dic]];
... ...
CNLiveMineModule/Classes/Module/CNLiveMineModule.m
  View file @e00ecea
... ... @@ -8,6 +8,9 @@
8 8  
9 9 #import "CNLiveMineModule.h"
10 10 #import "CNLiveServices.h"
  11 +#import "CNLiveInfoUpdateController.h"
  12 +#import "CNLiveMineService.h"
  13 +#import "CNLiveMineServiceProtocol.h"
11 14  
12 15 @BeeHiveMod(CNLiveMineModule)
13 16 @interface CNLiveMineModule()<BHModuleProtocol>
... ...
CNLiveMineModule/Classes/Module/CNLiveMineService.m
  View file @e00ecea
... ... @@ -19,6 +19,7 @@
19 19  
20 20 // 我的
21 21 - (UIViewController *)getMineViewController {
  22 +
22 23 return [CNLiveMineController new];
23 24 }
24 25  
... ...
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
  View file @e00ecea
... ... @@ -21,6 +21,8 @@
21 21 @end
22 22  
23 23 @implementation CNLiveInfoUpdateController
  24 +static const NSInteger margin = 15;
  25 +
24 26 #pragma mark - 初始化方法
25 27 - (instancetype)initWithModel:(CNLiveUserInfoModel *)model{
26 28 self = [super init];
... ... @@ -89,7 +91,7 @@
89 91 rightBtn.frame = CGRectMake(0, 0, 50, 25);
90 92 rightBtn.backgroundColor = [UIColor lightGrayColor];
91 93 rightBtn.userInteractionEnabled = NO;
92   - rightBtn.titleLabel.font = [UIFont boldSystemFontOfSize:15];
  94 + rightBtn.titleLabel.font = [UIFont boldSystemFontOfSize:14];
93 95 [rightBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
94 96 [rightBtn setTitle:@"完成" forState:UIControlStateNormal];
95 97 rightBtn.adjustsImageWhenHighlighted = NO;
... ... @@ -101,16 +103,16 @@
101 103 self.navigationItem.rightBarButtonItem = rightItem;
102 104 }
103 105 - (void)textField_layoutSubViews {
104   - UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
  106 + UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, 50)];
105 107 bgView.backgroundColor = [UIColor whiteColor];
106 108 [self.view addSubview:bgView];
107 109  
108   - UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 50)];
  110 + UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(margin, NavigationContentTop, SCREEN_WIDTH-2*margin, 50)];
109 111 textField.delegate = self;
110 112 textField.backgroundColor = [UIColor whiteColor];// 设置背景颜色
111 113 textField.textColor = [UIColor blackColor]; // 设置文字的颜色
112 114 textField.clearsOnBeginEditing = YES; // 当第二次输入的时候，清空上一次的内容
113   - textField.font = [UIFont boldSystemFontOfSize:15.0f];
  115 + textField.font = [UIFont systemFontOfSize:15.0f];
114 116 textField.clearButtonMode = UITextFieldViewModeWhileEditing; // 编辑的时候会显示出删除全部的小X
115 117 [self.view addSubview:textField];
116 118 self.textField = textField;
... ... @@ -119,15 +121,15 @@
119 121 }
120 122  
121 123 - (void)textView_layoutSubViews {
122   - UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 150)];
  124 + UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, 150)];
123 125 bgView.backgroundColor = [UIColor whiteColor];
124 126 [self.view addSubview:bgView];
125 127  
126   - UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 150)];
  128 + UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(margin, NavigationContentTop, SCREEN_WIDTH-2*margin, 150)];
127 129 textView.delegate = self;
128 130 textView.backgroundColor = [UIColor whiteColor];// 设置背景颜色
129 131 textView.textColor = [UIColor blackColor]; // 设置文字的颜色
130   - textView.font = [UIFont boldSystemFontOfSize:15.0f];
  132 + textView.font = [UIFont systemFontOfSize:15.0f];
131 133 [self.view addSubview:textView];
132 134 self.textView = textView;
133 135 self.textView.text = self.model.content;
... ... @@ -158,7 +160,6 @@
158 160 - (BOOL)textViewShouldEndEditing:(UITextView *)textView{
159 161 return YES;
160 162 }
161   -
162 163 - (void)textViewDidBeginEditing:(UITextView *)textView{
163 164  
164 165 }
... ...
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
  View file @e00ecea
... ... @@ -55,7 +55,7 @@ static const NSInteger margin = 12;
55 55 _pic.backgroundColor = [UIColor whiteColor];
56 56 _pic.contentMode = UIViewContentModeScaleToFill;
57 57 _pic.layer.masksToBounds = YES;
58   - _pic.layer.cornerRadius = 2;
  58 + _pic.layer.cornerRadius = 5.0;
59 59 UIImage *xw_image = [self xw_getImageName:model.content bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoCell class]];
60 60 [_pic sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image];
61 61  
... ...
Example/CNLiveMineModule/CNLIVEAppDelegate.m
  View file @e00ecea
... ... @@ -18,7 +18,7 @@
18 18 CNLiveMineController *vc = [[CNLiveMineController alloc] init];
19 19 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
20 20 self.window.rootViewController = nav;//设置根视图控制器
21   - [self.window makeKeyAndVisible];//设置成为
  21 + [self.window makeKeyAndVisible];
22 22 return YES;
23 23 }
24 24  
... ...