iOS Team / LiveVideoCloud · Commits

Commit 91982ce47a4b0e9b31d451ee774796ae60150864

Authored by 颜玄
1 parent 9ac51eb6

改bug，改ui

Inline Side-by-side
Showing 28 changed files with 154 additions and 193 deletions
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @91982ce
... ... @@ -13,7 +13,7 @@
13 13 #import "LVCMineViewController.h"
14 14 #import "LVCTabBar.h"
15 15  
16   -#import "LVCMineViewController.h"
  16 +#import "LVCMineViewController.h"//
17 17  
18 18 @interface ZXTabBarController ()<LVCTabBarDelegate>
19 19  
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/LVCWebViewController.m
  View file @91982ce
... ... @@ -46,9 +46,9 @@
46 46  
47 47 - (void)viewDidLoad {
48 48 [super viewDidLoad];
49   -
  49 +
50 50 self.webView.backgroundColor = CommonBgColor;
51   -
  51 +
52 52 [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.url]]];
53 53 }
54 54  
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineAboutUsController.m
  View file @91982ce
... ... @@ -7,6 +7,7 @@
7 7 //
8 8  
9 9 #import "MineAboutUsController.h"
  10 +#import "LVCWebViewController.h"
10 11 @interface MineAboutUsController ()<UIActionSheetDelegate>
11 12 @property (nonatomic ,strong) UIImageView *iconImageView;
12 13 @property (nonatomic ,strong) UILabel *tVNameLabel;
... ... @@ -41,7 +42,6 @@
41 42 label.textColor = [UIColor grayColorCNLive];
42 43 label.font = [UIFont systemFontOfSize:12.0f];
43 44 label.textAlignment = NSTextAlignmentCenter;
44   -// [label sizeToFit];
45 45 _companyNameLabel = label;
46 46 [self.view addSubview:_companyNameLabel];
47 47 }
... ... @@ -69,6 +69,7 @@
69 69 }
70 70 return _accessBtn;
71 71 }
  72 +
72 73 - (UIButton *)callBtn
73 74 {
74 75 if (!_callBtn) {
... ... @@ -94,6 +95,7 @@
94 95 return _disclaimerBtn;
95 96 }
96 97  
  98 +
97 99 - (UIView *)lineView
98 100 {
99 101 if (!_lineView) {
... ... @@ -103,6 +105,26 @@
103 105 return _lineView;
104 106 }
105 107  
  108 +- (void)buttonClick:(UIButton *)button
  109 +{
  110 + LVCWebViewController *generalWebView = [[LVCWebViewController alloc] init];
  111 + if (button.tag == 1000) {
  112 + NSString *webUrl = @"http://www.cnlive.com";
  113 + generalWebView.title = @"视讯中国官网";
  114 + generalWebView.url = webUrl;
  115 + [self.navigationController pushViewController:generalWebView animated:YES];
  116 +
  117 + }else if (button.tag == 1001){
  118 + UIActionSheet *action = [[UIActionSheet alloc] initWithTitle:@"400-666-7792" delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"拨打电话" otherButtonTitles: nil];
  119 + [action showInView:self.view];
  120 + }else{
  121 + NSString *webUrl = @"http://www.cnlive.com/other/page/mzsm.html";
  122 + generalWebView.url = webUrl;
  123 + [self.navigationController pushViewController:generalWebView animated:YES];
  124 +
  125 + }
  126 +}
  127 +
106 128  
107 129 - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex
108 130 {
... ... @@ -117,13 +139,12 @@
117 139  
118 140 - (void)viewDidLoad {
119 141 [super viewDidLoad];
120   -
121   -
  142 +
  143 +
122 144 }
123 145  
124 146 - (void)didReceiveMemoryWarning {
125 147 [super didReceiveMemoryWarning];
126   - // Dispose of any resources that can be recreated.
127 148 }
128 149  
129 150 -(void)bindView
... ... @@ -132,7 +153,7 @@
132 153 [self.view addSubview:self.lineView];
133 154 //270x270
134 155 self.iconImageView.frame = CGRectMake(SCREEN_W * 0.5 - [@45 ScaH], 50, [@90 ScaH], [@90 ScaH]);
135   - self.iconImageView.image = [UIImage imageNamed:@"精彩直播logo-5"];
  156 + self.iconImageView.image = [UIImage imageNamed:@"cnlive"];
136 157 self.tVNameLabel.frame = CGRectMake(self.iconImageView.centerX - 100, self.iconImageView.bottom + 10, 200, 30);
137 158 self.tVNameLabel.text = @"LiveVideoCloud";
138 159 self.accessBtn.frame = CGRectMake(_iconImageView.centerX- [@150 ScaH]*0.5, _tVNameLabel.bottom + [@35 ScaH], [@150 ScaH], [@30 ScaH]);
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineMessageController.m
  View file @91982ce
... ... @@ -25,14 +25,4 @@
25 25 // Dispose of any resources that can be recreated.
26 26 }
27 27  
28   -/*
29   -#pragma mark - Navigation
30   -
31   -// In a storyboard-based application, you will often want to do a little preparation before navigation
32   -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
33   - // Get the new view controller using [segue destinationViewController].
34   - // Pass the selected object to the new view controller.
35   -}
36   -*/
37   -
38 28 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/MinePersonalDataController.m
  View file @91982ce
... ... @@ -59,7 +59,7 @@
59 59 - (NSMutableArray *)localTitleArr
60 60 {
61 61 if (!_localTitleArr) {
62   - _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",@"所在地"],@[@"唯一绑定的视讯号id"], nil];
  62 + _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",@"所在地"],@[@"视讯号id"], nil];
63 63 }
64 64 return _localTitleArr;
65 65 }
... ... @@ -279,7 +279,6 @@
279 279 }
280 280 else
281 281 {//未登录 默认为空
282   -// if(indexPath.section == 2){
283 282 if(indexPath.section == 1){
284 283 cell.detailLabel.text = @"未设置";
285 284 }else
... ... @@ -304,8 +303,6 @@
304 303 if (indexPath.section == 0 && indexPath.row == 0) {
305 304 return 63;
306 305 }
307   -// if(indexPath.section == 1 && indexPath.row == 1)
308   -// return 200;
309 306 return 53;
310 307 }
311 308 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
... ... @@ -384,7 +381,7 @@
384 381 {
385 382 UIView* footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 200)];
386 383  
387   - UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];
  384 + UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];//#fff100
388 385 logoutBtn.frame = CGRectMake(20, 80, KScreenWidth-40, 40);
389 386 [logoutBtn addTarget:self action:@selector(logoutBtnAction) forControlEvents:UIControlEventTouchUpInside];
390 387 [footerView addSubview:logoutBtn];
... ... @@ -400,7 +397,6 @@
400 397  
401 398 - (void)didReceiveMemoryWarning {
402 399 [super didReceiveMemoryWarning];
403   - // Dispose of any resources that can be recreated.
404 400 }
405 401  
406 402 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineSettingViewController.m
  View file @91982ce
... ... @@ -20,6 +20,7 @@
20 20 @property (nonatomic, strong) NSMutableArray * localTitleArr;
21 21 @property (nonatomic ,strong) NSArray *localImageArr;
22 22  
  23 +@property (nonatomic , strong) NSString *clearCacheName;//定义清除缓存
23 24  
24 25 @end
25 26  
... ... @@ -27,8 +28,6 @@
27 28  
28 29 - (void)viewDidLoad {
29 30 [super viewDidLoad];
30   -// self.view.backgroundColor = CommonBgColor;
31   -
32 31 self.title = @"设置";
33 32 }
34 33  
... ... @@ -48,7 +47,6 @@
48 47 model.title = [NSString stringWithFormat:@"%d",arc4random()%10000000];
49 48 [self.dataarray addObject:model];
50 49 }
51   - // [self.tbv reloadData];
52 50 }
53 51 - (NSMutableArray *)dataarray
54 52 {
... ... @@ -60,17 +58,17 @@
60 58 - (NSMutableArray *)localTitleArr
61 59 {
62 60 if (!_localTitleArr) {
63   - _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"清除缓存"],@[@"帮助",@"关于我们"], nil];
64   -
  61 + _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"清除缓存"],@[@"帮助",@"关于我们",@"反馈意见"], nil];
  62 +
65 63 }
66 64 return _localTitleArr;
67 65 }
68 66 - (NSArray *)localImageArr
69 67 {
70 68 if (!_localImageArr) {
71   -
72   - _localImageArr = [[NSArray alloc] initWithObjects:@[@"Clear the cache_icon"],@[@"help_iocn",@"About us_icon"], nil];
73   -
  69 +
  70 + _localImageArr = [[NSArray alloc] initWithObjects:@[@"handShake"],@[@"MoreHelp",@"MoreAbout",@"MorePush"], nil];
  71 +
74 72 }
75 73 return _localImageArr;
76 74 }
... ... @@ -83,7 +81,7 @@
83 81 tableView.dataSource = self;
84 82 tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
85 83 tableView.backgroundColor = CommonBgColor;
86   -
  84 +
87 85 [tableView registerClass:[LVCClearCachesCell class] forCellReuseIdentifier:NSStringFromClass([LVCClearCachesCell class])];
88 86 [tableView registerClass:[LVCMineCommonCell class] forCellReuseIdentifier:NSStringFromClass([LVCMineCommonCell class])];
89 87 _tbv = tableView;
... ... @@ -99,13 +97,13 @@
99 97 }else
100 98 {
101 99 LVCMineCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCMineCommonCell class]) forIndexPath:indexPath];
102   -
  100 +
103 101 [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]];
104 102 return cell;
105 103  
106 104 }
107 105 return nil;
108   -
  106 +
109 107 }
110 108  
111 109 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
... ... @@ -128,7 +126,8 @@
128 126 //清除缓存
129 127 NSLog(@"清除缓存");
130 128 return;
131   - }else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"])
  129 + }
  130 + else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"])
132 131 {
133 132 LVCWebViewController *web = [[LVCWebViewController alloc] init];
134 133 web.url = @"http://data.cnlive.com/term/hdtv/hd_zhongguobi.html";
... ... @@ -140,17 +139,11 @@
140 139 MineAboutUsController * vc = [MineAboutUsController new];
141 140 vc.title = self.localTitleArr[indexPath.section][indexPath.row];
142 141 [self.navigationController pushViewController:vc animated:YES];
143   - }else
144   - {
145   -
146 142 }
147 143 }
148   -
149 144 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
150 145 {
151 146 return 10;
152 147 }
153 148  
154   -
155   -
156 149 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/ModifyInfomationController.m
  View file @91982ce
... ... @@ -17,9 +17,6 @@
17 17  
18 18 - (void)viewDidLoad {
19 19 [super viewDidLoad];
20   - // Do any additional setup after loading the view.
21   -
22   -// self.view.backgroundColor = CommonBgColor;
23 20 }
24 21  
25 22 - (void)bindView
... ... @@ -93,8 +90,6 @@
93 90 case ModifyInfoTypeAddress:
94 91 {
95 92 _modifyView = [[ModifyCommonView alloc] initWithFrame:CGRectMake(0, 6, SCREEN_W, 55) withType:ModifyInfoTypeAddress];
96   -
97   -// _modifyView = [[ModifyCommonView alloc] initWithFrame:CGRectMake(0, 6, SCREEN_W, 55 * 3 + 2) withType:ModifyInfoTypeAddress];
98 93 }
99 94 break;
100 95 case ModifyInfoTypePhoneNumber:
... ... @@ -158,8 +153,6 @@
158 153 return;
159 154 }
160 155 [self upLoadDataWithValue:_modifyView.textFieldTwo.text type:UserInfoTypeLocation];
161   -
162   -// [self upLoadDataWithValue:[NSString stringWithFormat:@"%@_%@_%@", _modifyView.textFieldOne.text, _modifyView.textFieldTwo.text, _modifyView.textFieldThree.text] type:UserInfoTypeLocation];
163 156 }
164 157 break;
165 158 case ModifyInfoTypePhoneNumber:
... ... @@ -267,15 +260,4 @@
267 260 [super didReceiveMemoryWarning];
268 261 // Dispose of any resources that can be recreated.
269 262 }
270   -
271   -/*
272   -#pragma mark - Navigation
273   -
274   -// In a storyboard-based application, you will often want to do a little preparation before navigation
275   -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
276   - // Get the new view controller using [segue destinationViewController].
277   - // Pass the selected object to the new view controller.
278   -}
279   -*/
280   -
281 263 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/LoginViewController.m
  View file @91982ce
... ... @@ -65,8 +65,6 @@
65 65  
66 66 - (void)setNotification
67 67 {
68   -// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:ThirdLoginSuccess object:nil];
69   -// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginFailure) name:ThirdLoginFailure object:nil];
70 68 }
71 69  
72 70 #pragma mark - action
... ... @@ -131,21 +129,6 @@
131 129 [self.navigationController pushViewController:regVC animated:YES];
132 130 }
133 131  
134   -//- (void)weChatBtnAction
135   -//{
136   -// [[CNLiveThirdLoginManager manager] weChatLogin];
137   -//}
138   -//
139   -//- (void)sinaBtnAction
140   -//{
141   -// [[CNLiveThirdLoginManager manager] sinaLogin];
142   -//}
143   -//
144   -//- (void)qqBtnAction
145   -//{
146   -// [[CNLiveThirdLoginManager manager] qqLogin];
147   -//}
148   -
149 132 - (void)loginSuccess
150 133 {
151 134 [self.navigationController popViewControllerAnimated:YES];
... ... @@ -185,14 +168,6 @@
185 168 - (UIButton *)loginBtn
186 169 {
187 170 if (!_loginBtn) {
188   -// _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
189   -// _loginBtn.backgroundColor = [UIColor yellowColorCNLive];
190   -// _loginBtn.layer.cornerRadius = 20;
191   -// _loginBtn.layer.masksToBounds = YES;
192   -// [_loginBtn setTitle:@"登 录" forState:UIControlStateNormal];
193   -// [_loginBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
194   -// _loginBtn.layer.borderWidth = 1.0f;//设置边框宽度
195   -// _loginBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
196 171 _loginBtn = [UIButton buttonWithTitle:@"登 录" titleColor:[UIColor blackColorCNLive] cornerRadius:20 borderWidth:1.0f borderColor:[UIColor blackColorCNLive] backgroundColor:[UIColor yellowColorCNLive]];
197 172 [_loginBtn setFrame:CGRectMake(10, self.idAndPwdView.bottom + 193 * 0.5, KScreenWidth - 20, 40)];
198 173 [_loginBtn addTarget:self action:@selector(loginBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ... @@ -203,10 +178,6 @@
203 178 - (UIButton *)forgetPwdBtn
204 179 {
205 180 if (!_forgetPwdBtn) {
206   -// _forgetPwdBtn = [UIButton buttonWithType:UIButtonTypeCustom];
207   -// _forgetPwdBtn.titleLabel.font = [UIFont systemFontOfSize:15];
208   -// [_forgetPwdBtn setTitle:@"忘记密码?" forState:UIControlStateNormal];
209   -// [_forgetPwdBtn setTitleColor:[UIColor grayColorCNLive] forState:UIControlStateNormal];
210 181 _forgetPwdBtn = [UIButton buttonWithTitle:@"忘记密码?" titleColor:[UIColor grayColorCNLive] labelFontSize:15];
211 182 CGSize forgetLabelSize = [_forgetPwdBtn.titleLabel labelSize];
212 183 [_forgetPwdBtn setFrame:CGRectMake(10, self.idAndPwdView.bottom + 24, forgetLabelSize.width, forgetLabelSize.height)];
... ... @@ -218,11 +189,6 @@
218 189 - (UIButton *)messageBtn
219 190 {
220 191 if (!_messageBtn) {
221   -// _messageBtn = [UIButton buttonWithType:UIButtonTypeCustom];
222   -// [_messageBtn setTitle:@"短信验证登录" forState:UIControlStateNormal];
223   -// _messageBtn.titleLabel.font = [UIFont systemFontOfSize:15];
224   -//
225   -// [_messageBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
226 192 _messageBtn = [UIButton buttonWithTitle:@"短信验证登录" titleColor:[UIColor blackColorCNLive] labelFontSize:15];
227 193 CGSize size = [_messageBtn.titleLabel labelSize];
228 194 [_messageBtn setFrame:CGRectMake(KScreenWidth - 10 - size.width, self.idAndPwdView.bottom + 24, size.width, size.height)];
... ... @@ -235,10 +201,6 @@
235 201 - (UIButton *)registerBtn
236 202 {
237 203 if (!_registerBtn) {
238   -// _registerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
239   -// [_registerBtn setTitle:@"注册" forState:UIControlStateNormal];
240   -// _registerBtn.titleLabel.font = [UIFont systemFontOfSize:15];
241   -// [_registerBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
242 204 _registerBtn = [UIButton buttonWithTitle:@"注册" titleColor:[UIColor blackColorCNLive] labelFontSize:15];
243 205 [_registerBtn setFrame:CGRectMake(0, 0, 40, 20)];
244 206 [_registerBtn addTarget:self action:@selector(registBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ... @@ -249,10 +211,6 @@
249 211 - (ZXLabel *)thirdPartyLoginLabel
250 212 {
251 213 if (!_thirdPartyLoginLabel) {
252   -// _thirdPartyLoginLabel = [[UILabel alloc] init];
253   -// _thirdPartyLoginLabel.textAlignment = NSTextAlignmentCenter;
254   -// _thirdPartyLoginLabel.textColor = [UIColor grayColorCNLive];
255   -// _thirdPartyLoginLabel.font = [UIFont systemFontOfSize:15];
256 214 _thirdPartyLoginLabel = [ZXUIKit labelTypeThirdParty];
257 215 _thirdPartyLoginLabel.text = @"第三方账号登录";
258 216 CGSize size = [_thirdPartyLoginLabel labelSize];
... ... @@ -263,10 +221,6 @@
263 221 - (ZXLabel *)weChatLbl
264 222 {
265 223 if (!_weChatLbl) {
266   -// _weChatLbl = [[UILabel alloc] init];
267   -// _weChatLbl.font = [UIFont systemFontOfSize:10];
268   -// _weChatLbl.textAlignment = NSTextAlignmentCenter;
269   -// _weChatLbl.textColor = [UIColor grayColorCNLive];
270 224 _weChatLbl = [ZXUIKit labelTypeThirdPartySmall];
271 225 _weChatLbl.text = @"微信";
272 226 _weChatLbl.width = 30;
... ... @@ -280,17 +234,6 @@
280 234 - (ZXLabel *)qqLbl
281 235 {
282 236 if (!_qqLbl) {
283   -// _qqLbl = [[UILabel alloc] init];
284   -// _qqLbl.font = [UIFont systemFontOfSize:10];
285   -// _qqLbl.textAlignment = NSTextAlignmentCenter;
286   -// _qqLbl.textColor = [UIColor grayColorCNLive];
287   -
288   -//// if ([CNLiveShare isInstalledWithAppType:WeChatType]) {
289   -//// [_qqLbl setCenter:CGPointMake(KScreenWidth / 2, KScreenHeight - 39 - 64)];
290   -//// }
291   -//// else {
292   -//// [_qqLbl setCenter:CGPointMake(KScreenWidth / 3, KScreenHeight - 39 - 64)];
293   -//// }
294 237 _qqLbl = [ZXUIKit labelTypeThirdPartySmall];
295 238 _qqLbl.width = 30;
296 239 _qqLbl.height = 20;
... ... @@ -304,17 +247,6 @@
304 247 - (ZXLabel *)sinaLbl
305 248 {
306 249 if (!_sinaLbl) {
307   -// _sinaLbl = [[UILabel alloc] init];
308   -// _sinaLbl.font = [UIFont systemFontOfSize:10];
309   -// _sinaLbl.textAlignment = NSTextAlignmentCenter;
310   -// _sinaLbl.textColor = [UIColor grayColorCNLive];
311   -
312   -//// if ([CNLiveShare isInstalledWithAppType:WeChatType]) {
313   -//// [_sinaLbl setCenter:CGPointMake(KScreenWidth - (53+45/2), KScreenHeight - 39 - 64)];
314   -//// }
315   -//// else {
316   -//// [_sinaLbl setCenter:CGPointMake(KScreenWidth / 3 * 2, KScreenHeight - 39 - 64)];
317   -//// }
318 250 _sinaLbl = [ZXUIKit labelTypeThirdPartySmall];
319 251 _sinaLbl.width = 30;
320 252 _sinaLbl.height = 20;
... ... @@ -327,10 +259,6 @@
327 259 - (UIButton *)weChatBtn
328 260 {
329 261 if (!_weChatBtn) {
330   -// _weChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
331   -// _weChatBtn.layer.cornerRadius = 90 / 4;
332   -// _weChatBtn.layer.masksToBounds = YES;
333   -// [_weChatBtn setImage:[UIImage imageNamed:@"wechat"] forState:UIControlStateNormal];
334 262 _weChatBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed:@"wechat"] cornerRadius:90 / 4];
335 263 [_weChatBtn setFrame:CGRectMake(SpaceWidth, self.thirdPartyLoginLabel.bottom + 15, 90 / 2, 90 / 2)];
336 264 [_weChatBtn addTarget:self action:@selector(weChatBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ... @@ -341,10 +269,6 @@
341 269 - (UIButton *)sinaBtn
342 270 {
343 271 if (!_sinaBtn) {
344   -// _sinaBtn = [UIButton buttonWithType:UIButtonTypeCustom];
345   -// _sinaBtn.layer.cornerRadius = 90 / 4;
346   -// _sinaBtn.layer.masksToBounds = YES;
347   -// [_sinaBtn setImage:[UIImage imageNamed:@"sina"] forState:UIControlStateNormal];
348 272 _sinaBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed:@"sina"] cornerRadius:90 / 4];
349 273 [_sinaBtn setFrame:CGRectMake(SpaceWidth*2+90/3, self.thirdPartyLoginLabel.bottom+ 15, 90 /2, 90 /2)];
350 274 [_sinaBtn addTarget:self action:@selector(sinaBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ... @@ -355,10 +279,6 @@
355 279 - (UIButton *)qqBtn
356 280 {
357 281 if (!_qqBtn) {
358   -// _qqBtn = [UIButton buttonWithType:UIButtonTypeCustom];
359   -// [_qqBtn setImage:[UIImage imageNamed:@"qq"] forState:UIControlStateNormal];
360   -// _qqBtn.layer.cornerRadius = 90 / 4;
361   -// _qqBtn.layer.masksToBounds = YES;
362 282 _qqBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed:@"qq"] cornerRadius:90 / 4];
363 283 [_qqBtn setFrame:CGRectMake(SpaceWidth*3+90 /3*2, self.thirdPartyLoginLabel.bottom + 15, 90 / 2, 90 / 2)];
364 284 [_qqBtn addTarget:self action:@selector(qqBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ...
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/RegisterCommonController.m
  View file @91982ce
... ... @@ -364,14 +364,6 @@
364 364 - (UIButton *)verificationBtn
365 365 {
366 366 if (!_verificationBtn) {
367   -// _verificationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
368   -// _verificationBtn.titleLabel.font = [UIFont systemFontOfSize:12];
369   -// [_verificationBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
370   -// _verificationBtn.layer.borderWidth = 1.0f;//设置边框宽度
371   -// _verificationBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
372   -// _verificationBtn.layer.cornerRadius = 25.0 * 0.5;
373   -// _verificationBtn.clipsToBounds = YES;
374   -// [_verificationBtn setTitle:@"获取验证码" forState:UIControlStateNormal];
375 367 _verificationBtn = [UIButton buttonWithTitle:@"获取验证码" titleColor:[UIColor blackColorCNLive] labelFontSize:12 cornerRadius:25.0 * 0.5 borderWidth:1.0f borderColor:[UIColor blackColorCNLive]];
376 368 [_verificationBtn setFrame:CGRectMake(SCREEN_W - 166 / 2, 7+(57-25)*0.5 , 146 / 2, 25)];
377 369 [_verificationBtn addTarget:self action:@selector(verificationBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ... @@ -445,14 +437,5 @@
445 437 {
446 438 [self.view endEditing:YES];
447 439 }
448   -/*
449   -#pragma mark - Navigation
450   -
451   -// In a storyboard-based application, you will often want to do a little preparation before navigation
452   -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
453   - // Get the new view controller using [segue destinationViewController].
454   - // Pass the selected object to the new view controller.
455   -}
456   -*/
457 440  
458 441 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCClearCachesCell.m
  View file @91982ce
... ... @@ -42,8 +42,6 @@
42 42 //子线程计算大小
43 43 dispatch_async(dispatch_get_global_queue(0, 0), ^{
44 44 NSLog(@"aaaaa");
45   - //获取缓存文件夹路径
46   -// NSLog(@"%@",[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).lastObject stringByAppendingPathComponent:@"Custom"]);
47 45 unsigned long long size = ZXCustomCacheFile.zx_fileSize;
48 46 size += [SDImageCache sharedImageCache].getSize;
49 47  
... ... @@ -166,11 +164,6 @@
166 164 CGContextSetFillColorWithColor(context, [UIColor clearColor].CGColor);
167 165 CGContextFillRect(context, rect);
168 166  
169   - //上分割线，
170   - // CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"ffffff"].CGColor);
171   - // CGContextStrokeRect(context, CGRectMake(5, -1, rect.size.width - 10, 1));
172   -
173   -// NSLog(@"cell h = %f,w = %f",rect.size.height,rect.size.width);
174 167 //下分割线
175 168 CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"e3e1e1"].CGColor);
176 169 CGContextStrokeRect(context, CGRectMake(10, rect.size.height, rect.size.width - 20, 1));
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCLoginShowView.m
  View file @91982ce
... ... @@ -107,7 +107,7 @@
107 107 self.leftBtn.frame = CGRectMake(20 / 2, - LoginViewHeight+ 20 + (44 - 66 / 3) / 2, 66 / 3, 66 /3);
108 108 self.rightBtn.frame = CGRectMake(SCREEN_W -66 / 3 - 20 / 2, - LoginViewHeight+20 + (44 - 66 / 3) / 2, 66 / 3, 66 / 3);
109 109  
110   - self.navTitleLabel.text = @"我 的";
  110 + self.navTitleLabel.text = @" ";
111 111 CGSize size = [self.navTitleLabel labelSize];
112 112 self.navTitleLabel.center = CGPointMake(SCREEN_W * 0.5 - 0.5 *size.width, - LoginViewHeight + 20 + 0.5 *size.height);
113 113 self.navTitleLabel.width = size.width;
... ... @@ -130,7 +130,6 @@
130 130 {
131 131 self.nameLabel.text = @"您还没有登录哟~";
132 132 CGSize nameSize = [self.nameLabel labelSize];
133   -// self.nameLabel.center = CGPointMake(_iconImageView.center.x - nameSize.width * 0.5, -LoginViewHeight - _iconImageView.bottom + 15 + nameSize.height * 0.5);
134 133 self.nameLabel.centerX = _iconImageView.center.x - nameSize.width * 0.5;
135 134 self.nameLabel.width = nameSize.width;
136 135 self.nameLabel.height = nameSize.height;
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCMineShowCell.m
  View file @91982ce
... ... @@ -31,13 +31,6 @@
31 31  
32 32 - (ZXLabel *)nameLabel {
33 33 if (!_nameLabel) {
34   -// UILabel* label = [[UILabel alloc]init];
35   -// label.backgroundColor = [UIColor clearColor];
36   -// label.textColor = [UIColor blackColor];
37   -// label.font = [UIFont systemFontOfSize:15.0f];
38   -// label.textAlignment = NSTextAlignmentCenter;
39   -//
40   -// _nameLabel = label;
41 34 [ZXUIKit labelTypeNavSmall];
42 35 [self addSubview:_nameLabel];
43 36 }
... ... @@ -46,12 +39,6 @@
46 39  
47 40 - (ZXLabel *)navTitleLabel {
48 41 if (!_navTitleLabel) {
49   -// UILabel* label = [[UILabel alloc]init];
50   -// label.backgroundColor = [UIColor clearColor];
51   -// label.textColor = [UIColor blackColor];
52   -// label.font = [UIFont systemFontOfSize:22.0f];
53   -// label.textAlignment = NSTextAlignmentCenter;
54   -// _navTitleLabel = label;
55 42 _navTitleLabel = [ZXUIKit labelTypeNavCenter];
56 43 _navTitleLabel.text = @"我 的";
57 44 [self addSubview:_navTitleLabel];
... ... @@ -63,8 +50,6 @@
63 50 {
64 51 if (!_leftBtn) {
65 52 _leftBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed: @"search"]];
66   -// _leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
67   -// [_leftBtn setImage:[UIImage imageNamed:@"search"] forState:UIControlStateNormal];
68 53 [_leftBtn addTarget:self action:@selector(searchBtnClick) forControlEvents:UIControlEventTouchUpInside];
69 54 [self addSubview:_leftBtn];
70 55 }
... ... @@ -74,8 +59,6 @@
74 59 {
75 60 if (!_rightBtn) {
76 61 _rightBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed: @"edit"]];
77   -// _rightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
78   -// [_rightBtn setImage:[UIImage imageNamed:@" edit"] forState:UIControlStateNormal];
79 62 [_rightBtn addTarget:self action:@selector(editBtnClick) forControlEvents:UIControlEventTouchUpInside];
80 63 [self addSubview:_rightBtn];
81 64  
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/PlayRecordCell.m
  View file @91982ce
... ... @@ -134,10 +134,6 @@
134 134 CGContextSetFillColorWithColor(context, [UIColor clearColor].CGColor);
135 135 CGContextFillRect(context, rect);
136 136  
137   - //上分割线，
138   - // CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"ffffff"].CGColor);
139   - // CGContextStrokeRect(context, CGRectMake(5, -1, rect.size.width - 10, 1));
140   -
141 137 //下分割线
142 138 CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"e3e1e1"].CGColor);
143 139 CGContextStrokeRect(context, CGRectMake(10, rect.size.height, rect.size.width - 20, 1));
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
  View file @91982ce
... ... @@ -109,7 +109,7 @@
109 109 - (void)quitBtnClick { // 退出
110 110  
111 111 [_player stop];
112   - if (self.navigationController.viewControllers.count > 2) {
  112 + if (self.navigationController.viewControllers.count > 2) {//判断
113 113 [self.navigationController popViewControllerAnimated:YES];
114 114 }
115 115  
... ...
LiveVideoCloud/HttpService/HttpService.m
  View file @91982ce
... ... @@ -52,7 +52,7 @@ static HttpService * __singleton__;
52 52 NSString *methodStr = [self stringWithMethod:method];
53 53 NSMutableURLRequest *request = [_dataSessionManager.requestSerializer requestWithMethod:methodStr URLString:urlStr parameters:parameters error:nil];
54 54 __block NSURLSessionDataTask *task = nil;
55   - task = [_dataSessionManager dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
  55 + task = [_dataSessionManager dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {//
56 56 [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
57 57 NSError *err = nil;
58 58 id data = nil;
... ...
LiveVideoCloud/UtilKits/Category/UIColor+HexString.m
  View file @91982ce
... ... @@ -92,9 +92,9 @@
92 92 }
93 93  
94 94  
95   -+ (UIColor *)yellowColorCNLive//后期全部要修改
  95 ++ (UIColor *)yellowColorCNLive//
96 96 {
97   - return [self colorWithHexString:@"#BDFCC9"];//
  97 + return [self colorWithHexString:@"fff100"];//
98 98 }
99 99  
100 100 + (UIColor *)redColorCNLive
... ...
LiveVideoCloud/UtilKits/UserInformationModel.h
  View file @91982ce
... ... @@ -18,7 +18,7 @@
18 18 @property (nonatomic ,copy) NSString *state;//状态
19 19 @property (nonatomic ,copy) NSString *chinaCoin;//中国币数量
20 20 @property (nonatomic, copy) NSString *faceUrl;//头像url
21   -@property (nonatomic, copy) NSString *token;//唯一标识视讯号id
  21 +@property (nonatomic, copy) NSString *token;//w标识视讯号id
22 22 @property (nonatomic, copy) NSString *extInfo;//自定义信息
23 23 @property (nonatomic, copy)NSString *mobile;//手机号
24 24 @property (nonatomic, copy)NSString *email;//邮箱
... ...
LiveVideoCloud/UtilKits/UtilKits.h
  View file @91982ce
... ... @@ -36,7 +36,7 @@
36 36  
37 37 #define CURRENT_WINDOW [[UIApplication sharedApplication].windows lastObject]
38 38  
39   -#define LoginViewHeight 209
  39 +#define LoginViewHeight 235//209
40 40 #define SMALL_MARGIN 5
41 41 #define CURRENT_WINDOW [[UIApplication sharedApplication].windows lastObject]
42 42  
... ...
LiveVideoCloud/animation.xcassets/mine/MoreAbout.imageset/Contents.json 0 → 100644
  View file @91982ce
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "MoreAbout@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/mine/MoreAbout.imageset/MoreAbout@2x.png 0 → 100644
View file @91982ce

3.91 KB
LiveVideoCloud/animation.xcassets/mine/MoreHelp.imageset/Contents.json 0 → 100644
  View file @91982ce
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "MoreHelp@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/mine/MoreHelp.imageset/MoreHelp@2x.png 0 → 100644
View file @91982ce

3.72 KB
LiveVideoCloud/animation.xcassets/mine/MorePush.imageset/Contents.json 0 → 100644
  View file @91982ce
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "MorePush@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/mine/MorePush.imageset/MorePush@2x.png 0 → 100644
View file @91982ce

4.19 KB
LiveVideoCloud/animation.xcassets/mine/cnlive.imageset/Contents.json 0 → 100644
  View file @91982ce
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "cnlive.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/mine/cnlive.imageset/cnlive.png 0 → 100644
View file @91982ce

8.7 KB
LiveVideoCloud/animation.xcassets/mine/handShake.imageset/Contents.json 0 → 100644
  View file @91982ce
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "handShake@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 22 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/mine/handShake.imageset/handShake@2x.png 0 → 100644
View file @91982ce

4.82 KB