iOS Team / LiveVideoCloud · Commits

Commit 6137bf4aaeaffaad67a26b006f37e41c41ca1c6b

Authored by 张旭
1 parent 65cd56af

修改用户代码和tabbar

Inline Side-by-side
Showing 22 changed files with 225 additions and 112 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
  View file @6137bf4
... ... @@ -28,7 +28,6 @@
28 28 4B45CE861EB86A590079AFB7 /* LVCLoginShowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE6B1EB86A590079AFB7 /* LVCLoginShowView.m */; };
29 29 4B45CE871EB86A590079AFB7 /* LVCMineCommonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE6D1EB86A590079AFB7 /* LVCMineCommonCell.m */; };
30 30 4B45CE881EB86A590079AFB7 /* LVCMineShowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE6F1EB86A590079AFB7 /* LVCMineShowCell.m */; };
31   - 4B45CE891EB86A590079AFB7 /* LVCPersonalImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE711EB86A590079AFB7 /* LVCPersonalImageCell.m */; };
32 31 4B45CE8A1EB86A590079AFB7 /* LVCPersonCommonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE731EB86A590079AFB7 /* LVCPersonCommonCell.m */; };
33 32 4B45CE8B1EB86A590079AFB7 /* LVCTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE751EB86A590079AFB7 /* LVCTextField.m */; };
34 33 4B45CE971EB86A760079AFB7 /* UIButton+createButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE8E1EB86A760079AFB7 /* UIButton+createButton.m */; };
... ... @@ -208,12 +207,6 @@
208 207 D2393D261F0256FE00D3EE17 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D2393D251F0256FE00D3EE17 /* libstdc++.tbd */; };
209 208 D2393D281F02572100D3EE17 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2393D271F02572100D3EE17 /* CoreTelephony.framework */; };
210 209 D2393D2C1F02682000D3EE17 /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2393D2B1F02682000D3EE17 /* CNLiveUserSystemSDK.framework */; };
211   - D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDB71EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m */; };
212   - D23BBDBB1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDBA1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m */; };
213   - D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDBD1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m */; };
214   - D23BBDC11EF8F513002FE0B8 /* LVCBqWqXgModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDC01EF8F513002FE0B8 /* LVCBqWqXgModel.m */; };
215   - D23BBDC41EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDC31EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.m */; };
216   - D23BBDC71EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDC61EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m */; };
217 210 D23DC1551ECC41C100103B0E /* LVCVerifyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D23DC1541ECC41C100103B0E /* LVCVerifyViewController.m */; };
218 211 D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = D24571571E8393EB00AA85D6 /* UIImageView+ZXExtension.m */; };
219 212 D245715C1E83A62B00AA85D6 /* BounceView.m in Sources */ = {isa = PBXBuildFile; fileRef = D245715B1E83A62B00AA85D6 /* BounceView.m */; };
... ... @@ -347,8 +340,6 @@
347 340 4B45CE6D1EB86A590079AFB7 /* LVCMineCommonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMineCommonCell.m; sourceTree = "<group>"; };
348 341 4B45CE6E1EB86A590079AFB7 /* LVCMineShowCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMineShowCell.h; sourceTree = "<group>"; };
349 342 4B45CE6F1EB86A590079AFB7 /* LVCMineShowCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMineShowCell.m; sourceTree = "<group>"; };
350   - 4B45CE701EB86A590079AFB7 /* LVCPersonalImageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCPersonalImageCell.h; sourceTree = "<group>"; };
351   - 4B45CE711EB86A590079AFB7 /* LVCPersonalImageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPersonalImageCell.m; sourceTree = "<group>"; };
352 343 4B45CE721EB86A590079AFB7 /* LVCPersonCommonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCPersonCommonCell.h; sourceTree = "<group>"; };
353 344 4B45CE731EB86A590079AFB7 /* LVCPersonCommonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPersonCommonCell.m; sourceTree = "<group>"; };
354 345 4B45CE741EB86A590079AFB7 /* LVCTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTextField.h; sourceTree = "<group>"; };
... ... @@ -725,18 +716,6 @@
725 716 D2393D251F0256FE00D3EE17 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
726 717 D2393D271F02572100D3EE17 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
727 718 D2393D2B1F02682000D3EE17 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUserSystemSDK.framework; sourceTree = "<group>"; };
728   - D23BBDB61EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMainHeaderCollectionReusableView.h; sourceTree = "<group>"; };
729   - D23BBDB71EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMainHeaderCollectionReusableView.m; sourceTree = "<group>"; };
730   - D23BBDB91EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBannerAndMarqueeModel.h; sourceTree = "<group>"; };
731   - D23BBDBA1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBannerAndMarqueeModel.m; sourceTree = "<group>"; };
732   - D23BBDBC1EF8ED4A002FE0B8 /* LVCChannelDetailModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChannelDetailModel.h; sourceTree = "<group>"; };
733   - D23BBDBD1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChannelDetailModel.m; sourceTree = "<group>"; };
734   - D23BBDBF1EF8F513002FE0B8 /* LVCBqWqXgModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBqWqXgModel.h; sourceTree = "<group>"; };
735   - D23BBDC01EF8F513002FE0B8 /* LVCBqWqXgModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBqWqXgModel.m; sourceTree = "<group>"; };
736   - D23BBDC21EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMainHorizontalCollectionViewCell.h; sourceTree = "<group>"; };
737   - D23BBDC31EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMainHorizontalCollectionViewCell.m; sourceTree = "<group>"; };
738   - D23BBDC51EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCSectionHeaderCollectionReusableView.h; sourceTree = "<group>"; };
739   - D23BBDC61EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCSectionHeaderCollectionReusableView.m; sourceTree = "<group>"; };
740 719 D23DC1531ECC41C100103B0E /* LVCVerifyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVerifyViewController.h; sourceTree = "<group>"; };
741 720 D23DC1541ECC41C100103B0E /* LVCVerifyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVerifyViewController.m; sourceTree = "<group>"; };
742 721 D24571561E8393EB00AA85D6 /* UIImageView+ZXExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+ZXExtension.h"; sourceTree = "<group>"; };
... ... @@ -977,8 +956,6 @@
977 956 4B45CE6D1EB86A590079AFB7 /* LVCMineCommonCell.m */,
978 957 4B45CE6E1EB86A590079AFB7 /* LVCMineShowCell.h */,
979 958 4B45CE6F1EB86A590079AFB7 /* LVCMineShowCell.m */,
980   - 4B45CE701EB86A590079AFB7 /* LVCPersonalImageCell.h */,
981   - 4B45CE711EB86A590079AFB7 /* LVCPersonalImageCell.m */,
982 959 4B45CE721EB86A590079AFB7 /* LVCPersonCommonCell.h */,
983 960 4B45CE731EB86A590079AFB7 /* LVCPersonCommonCell.m */,
984 961 4B45CE741EB86A590079AFB7 /* LVCTextField.h */,
... ... @@ -1348,7 +1325,6 @@
1348 1325 D2393D101F0250A700D3EE17 /* SinaSDK */,
1349 1326 D2393D091F0250A100D3EE17 /* WeChatSDK */,
1350 1327 D2393D041F02505400D3EE17 /* QQSDK */,
1351   - D214CB4B1EF7BD890014EEBA /* V8HorizontalPickerView */,
1352 1328 4BD855D41EBACD530082061D /* AFNetworking */,
1353 1329 81FB5B391E7A6FFC00F98E1D /* SevenSwitch */,
1354 1330 810B64E41E779B1F00133E15 /* Masonry */,
... ... @@ -2442,7 +2418,6 @@
2442 2418 81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */,
2443 2419 D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */,
2444 2420 D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
2445   - 4B45CE891EB86A590079AFB7 /* LVCPersonalImageCell.m in Sources */,
2446 2421 D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
2447 2422 810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */,
2448 2423 D2EBC88E1F023AA400F198FB /* LVCVodPlayerController.m in Sources */,
... ... @@ -2709,6 +2684,7 @@
2709 2684 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
2710 2685 CLANG_ENABLE_OBJC_WEAK = YES;
2711 2686 DEVELOPMENT_TEAM = 94X49GG3ZW;
  2687 + ENABLE_BITCODE = NO;
2712 2688 FRAMEWORK_SEARCH_PATHS = (
2713 2689 "$(inherited)",
2714 2690 "$(PROJECT_DIR)/LiveVideoCloud/Classes/CNLiveSDK",
... ... @@ -2725,7 +2701,6 @@
2725 2701 "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/WeChatSDK",
2726 2702 "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/SinaSDK",
2727 2703 );
2728   - OTHER_LDFLAGS = "";
2729 2704 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shipinzhongguo;
2730 2705 PRODUCT_NAME = "$(TARGET_NAME)";
2731 2706 };
... ... @@ -2738,6 +2713,7 @@
2738 2713 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
2739 2714 CLANG_ENABLE_OBJC_WEAK = YES;
2740 2715 DEVELOPMENT_TEAM = 94X49GG3ZW;
  2716 + ENABLE_BITCODE = NO;
2741 2717 FRAMEWORK_SEARCH_PATHS = (
2742 2718 "$(inherited)",
2743 2719 "$(PROJECT_DIR)/LiveVideoCloud/Classes/CNLiveSDK",
... ... @@ -2754,7 +2730,6 @@
2754 2730 "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/WeChatSDK",
2755 2731 "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/SinaSDK",
2756 2732 );
2757   - OTHER_LDFLAGS = "";
2758 2733 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shipinzhongguo;
2759 2734 PRODUCT_NAME = "$(TARGET_NAME)";
2760 2735 };
... ...
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @6137bf4
... ... @@ -26,7 +26,7 @@
26 26 [super viewDidLoad];
27 27 // Do any additional setup after loading the view.
28 28  
29   - [[UITabBar appearance] setBarTintColor:[UIColor blackColorZX]];
  29 + [[UITabBar appearance] setBarTintColor:[UIColor backgroundColor]];
30 30 //取消tabBar的透明效果
31 31 [UITabBar appearance].translucent = NO;
32 32  
... ...
LiveVideoCloud/Classes/Sections/Mine/Controllers/MinePersonalDataController.m
  View file @6137bf4
1 1 //
2 2 // MinePersonalDataController.m
3   -// LiveVideoCloud
  3 +// WonderfulLive
4 4 //
5   -// Created by cnlive on 17/4/11.
6   -// Copyright © 2017年 CNLive. All rights reserved.
  5 +// Created by cnlive on 2016/10/24.
  6 +// Copyright © 2016年 CNLive. All rights reserved.
7 7 //
8 8  
9 9 #import "MinePersonalDataController.h"
10 10 #import "LVCPersonCommonCell.h"
11 11 #import "LVCMineModel.h"
12 12 #import "ModifyInfomationController.h"
13   -#import "IDViewController.h"
14 13  
15 14 #import "MineLiveController.h"
16 15 @interface MinePersonalDataController ()<UITableViewDelegate,UITableViewDataSource,UIImagePickerControllerDelegate, UINavigationControllerDelegate,UIAlertViewDelegate,UIActionSheetDelegate>
17 16 {
18   -// BOOL isLogin;
  17 + // BOOL isLogin;
19 18 }
20   -@property (nonatomic, strong) UITableView * tbv;//调用的登录sdk
  19 +@property (nonatomic, strong) UITableView * tbv;
21 20 @property (nonatomic, strong) NSMutableArray * dataarray;
22 21 @property (nonatomic, strong) NSMutableArray * localTitleArr;
23 22  
... ... @@ -29,7 +28,7 @@
29 28 [super viewDidLoad];
30 29  
31 30 self.title = @"个人资料";
32   -// self.view.backgroundColor = CommonBgColor;
  31 + // self.view.backgroundColor = CommonBgColor;
33 32 }
34 33  
35 34  
... ... @@ -47,8 +46,27 @@
47 46 }
48 47 -(void)bindModel
49 48 {
50   - [self.dataarray removeAllObjects];}
  49 + [self.dataarray removeAllObjects];
  50 + // isLogin = NO;
  51 + //
  52 + // if ([UserTools isLogin])
  53 + // {
  54 + // isLogin = YES;
  55 + // }else
  56 + // {
  57 + // isLogin = NO;
  58 + // }
  59 +}
51 60  
  61 +//- (UIButton *)quitBtn
  62 +//{
  63 +// if (!_quitBtn) {
  64 +// _quitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
  65 +// [_quitBtn setImage:[UIImage imageNamed:@" edit"] forState:UIControlStateNormal];
  66 +// [_quitBtn addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
  67 +// }
  68 +// return _quitBtn;
  69 +//}
52 70 - (NSMutableArray *)dataarray
53 71 {
54 72 if (!_dataarray) {
... ... @@ -59,17 +77,19 @@
59 77 - (NSMutableArray *)localTitleArr
60 78 {
61 79 if (!_localTitleArr) {
62   - _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",@"所在地"],@[@"视讯号id"], nil];
  80 + // _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"精灵ID",@"昵称",@"性别",@"手机号",@"邮箱",],@[@"个性签名",@"年龄",@"状态",@"职业"],@[@"收货地址"], nil];
  81 + // _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"精灵ID",@"昵称",@"性别",@"手机号",@"邮箱",],@[@"收货地址"], nil];
  82 + _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",],@[@"收货地址"], nil];
63 83 }
64 84 return _localTitleArr;
65 85 }
66 86  
67   -- (void)logoutBtnAction//注销登出button
  87 +- (void)logoutBtnAction
68 88 {
69   - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"确定要离开吗？" message:nil delegate:self cancelButtonTitle:@"我手滑了" otherButtonTitles:@"忍痛离开", nil];
  89 + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"你真的要注销吗？" message:nil delegate:self cancelButtonTitle:@"我骗你的" otherButtonTitles:@"注销", nil];
70 90 alert.tag = 1002;
71 91 [alert show];
72   -
  92 +
73 93 }
74 94 #pragma mark - UIAlertViewDelegate
75 95 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
... ... @@ -84,7 +104,16 @@
84 104  
85 105 [[UserInformationModel manager] cleanUserInfo];
86 106 [UserTools clearLocalUserInfo];
87   -
  107 + //清除个人信息
  108 + // [CNLiveShare logoutWithAPPType:WeChatType result:NULL];
  109 + // [CNLiveShare logoutWithAPPType:QQType result:NULL];
  110 + // [CNLiveShare logoutWithAPPType:SinaType result:NULL];
  111 + // [CNlivePersonalCenter clearLocalUserInfoForLogout];
  112 + // [UserTools setUserLogin:NO];
  113 +
  114 + //清除个人信息邀请码
  115 + // [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:@"kinvitecode"];
  116 +
88 117 [self.navigationController popViewControllerAnimated:YES];
89 118 }
90 119 }
... ... @@ -159,11 +188,10 @@
159 188 MBProgressHUD *hud = [Tools showActivityHudInView:self.view withString:@"修改中"];
160 189 [CNLiveUserSystemCenter uploadIconWithUid:[UserInformationModel manager].uid icon:image success:^(id result) {
161 190 [hud hide:NO];
162   -
  191 +
163 192 [Tools showHUDInView:CURRENT_WINDOW withString:@"修改头像成功" autoHide:YES];
164 193 [UserTools saveUserinfoDic:result[@"data"]];
165 194 [_tbv reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
166   -
167 195 } failure:^(NSDictionary *errorDic) {
168 196 [Tools showHUDInView:self.view withString:@"修改失败，请稍后再试" autoHide:YES];
169 197 }];
... ... @@ -181,7 +209,7 @@
181 209 [UserTools setLocalUserInfo:string withKey:@"gender"];
182 210 [_tbv reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:2 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
183 211 } failure:^(NSDictionary *errorDic) {
184   - [Tools showHUDInView:self.view withString:@"修改失败，请稍后再试" autoHide:YES];
  212 + [Tools showHUDInView:self.view withString:@"修改失败，请稍后再试" autoHide:YES];
185 213 }];
186 214 }
187 215  
... ... @@ -195,7 +223,6 @@
195 223 tableView.showsHorizontalScrollIndicator = NO;
196 224 tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
197 225 tableView.backgroundColor = CommonBgColor;
198   -
199 226 [tableView registerClass:[LVCPersonCommonCell class] forCellReuseIdentifier:NSStringFromClass([LVCPersonCommonCell class])];
200 227 _tbv = tableView;
201 228 }
... ... @@ -205,7 +232,7 @@
205 232 {
206 233 LVCPersonCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCPersonCommonCell class]) forIndexPath:indexPath];
207 234 cell.userInteractionEnabled = YES;
208   -
  235 +
209 236 if (indexPath.section == 0 && indexPath.row == 0) {
210 237 cell.type = PersonalCellTypeIcon;
211 238 }
... ... @@ -217,6 +244,19 @@
217 244 {
218 245 cell.type = PersonalCellTypedetailWithIndicator;
219 246 }
  247 + // else if (indexPath.section == 0 && indexPath.row == 1 )
  248 + // {
  249 + // cell.type = PersonalCellTypedetailID;
  250 + // cell.userInteractionEnabled = NO;
  251 + // }else if (indexPath.section == 0 && indexPath.row == 2)
  252 + // {
  253 + // cell.type = PersonalCellTypedetailNick;
  254 + // }
  255 + // else
  256 + // {
  257 + // cell.type = PersonalCellTypedetailWithIndicator;
  258 + // }
  259 +
220 260 if([UserTools isLogin]){//填入有值选项
221 261 UserInformationModel *personalModel = [UserInformationModel manager];
222 262 cell.personalModel = personalModel;
... ... @@ -257,37 +297,61 @@
257 297 cell.detailLabel.text = personalModel.email;
258 298 }
259 299 break;
260   - case 5:
261   - {
262   - if (personalModel.location.length > 0)//收货地址
263   - {
264   - cell.detailLabel.text = personalModel.location;
265   - }
266   - else
267   - {
268   - cell.detailTextLabel.text = @"未设置";
269   - }
270   - }
271 300 default:
272 301 {
273 302  
274 303 }
275 304 break;
276 305 }
  306 + // }else if (indexPath.section == 1) {
  307 + // switch (indexPath.row) {
  308 + // case 0:
  309 + // {
  310 + // cell.detailLabel.text = personalModel.personalitySignature;
  311 + // }
  312 + // break;
  313 + // case 1:
  314 + // {
  315 + // cell.detailLabel.text = personalModel.age;
  316 + // }
  317 + // break;
  318 + // case 2:
  319 + // {
  320 + // cell.detailLabel.text = personalModel.state;
  321 + // }
  322 + // break;
  323 + // case 3:
  324 + // {
  325 + // cell.detailLabel.text = personalModel.professional;
  326 + // }
  327 + // break;
  328 + // default:
  329 + // break;
  330 + // }
  331 + }
  332 + else//收货地址
  333 + {
  334 + if(personalModel.location.length > 0)
  335 + {
  336 + cell.detailLabel.text = personalModel.location;
  337 + }else
  338 + {
  339 + cell.detailLabel.text = @"未设置";
  340 + }
  341 + }
  342 + }
  343 + else
  344 + {//未登录 默认为空
  345 + // if(indexPath.section == 2){
  346 + if(indexPath.section == 1){
  347 + cell.detailLabel.text = @"未设置";
  348 + }else
  349 + {
  350 + cell.detailLabel.text = @"";
277 351 }
278   -
279 352 }
280   - else
281   - {//未登录 默认为空
282   - if(indexPath.section == 1){
283   - cell.detailLabel.text = @"未设置";
284   - }else
285   - {
286   - cell.detailLabel.text = @"";
287   - }
288   - }
289 353 [cell loadUIWithModel:self.localTitleArr[indexPath.section][indexPath.row]];//设置本地名
290   - return cell;
  354 + return cell;
291 355 }
292 356  
293 357 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
... ... @@ -303,6 +367,8 @@
303 367 if (indexPath.section == 0 && indexPath.row == 0) {
304 368 return 63;
305 369 }
  370 + // if(indexPath.section == 1 && indexPath.row == 1)
  371 + // return 200;
306 372 return 53;
307 373 }
308 374 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
... ... @@ -326,10 +392,10 @@
326 392 break;
327 393 case 2:
328 394 {
329   - UIActionSheet *action = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"男" otherButtonTitles:@"女", nil];//修改性别时的弹窗，男or女
  395 + UIActionSheet *action = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"男" otherButtonTitles:@"女", nil];
330 396 action.tag = 102;
331 397 [action showInView:self.view];
332   -
  398 +
333 399 }
334 400 break;
335 401 case 3:
... ... @@ -346,26 +412,24 @@
346 412 [self.navigationController pushViewController:modify animated:YES];
347 413 }
348 414 break;
349   - case 5://
350   - {
351   - ModifyInfomationController *modify = [[ModifyInfomationController alloc] init];
352   - modify.type = ModifyInfoTypeAddress;//@"所在地";
353   - [self.navigationController pushViewController:modify animated:YES];
354   - }
355   -
356   -
357 415 default:
358 416 break;
359 417 }
360   -
  418 +
361 419 return;
362 420 }else if(indexPath.section == 1)
363 421 {
364   -
  422 + ModifyInfomationController *modify = [[ModifyInfomationController alloc] init];
  423 + modify.type = ModifyInfoTypeAddress;//@"设置地址";
  424 + [self.navigationController pushViewController:modify animated:YES];
365 425 }else
366 426 {
367 427  
368 428 }
  429 +
  430 + // MineLiveController * vc = [MineLiveController new];
  431 + // vc.title = self.localTitleArr[indexPath.section][indexPath.row];
  432 + // [self.navigationController pushViewController:vc animated:YES];
369 433 }
370 434 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
371 435 {
... ... @@ -380,8 +444,16 @@
380 444 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
381 445 {
382 446 UIView* footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 200)];
  447 + // UIButton *logoutBtn = [UIButton buttonWithType:UIButtonTypeCustom];
  448 + // [logoutBtn setBackgroundImage:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] forState:UIControlStateNormal];
  449 + // [logoutBtn setBackgroundImage:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]] forState:UIControlStateHighlighted];
  450 + // [logoutBtn setTitle:@"注销" forState:UIControlStateNormal];
  451 + // [logoutBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
  452 + // logoutBtn.titleLabel.font = [UIFont systemFontOfSize:17];
  453 + // logoutBtn.layer.cornerRadius = 20;
  454 + // logoutBtn.layer.masksToBounds = YES;
383 455  
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
  456 + UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];
385 457 logoutBtn.frame = CGRectMake(20, 80, KScreenWidth-40, 40);
386 458 [logoutBtn addTarget:self action:@selector(logoutBtnAction) forControlEvents:UIControlEventTouchUpInside];
387 459 [footerView addSubview:logoutBtn];
... ... @@ -395,8 +467,53 @@
395 467 return 0;
396 468 }
397 469  
  470 +//-(void)scrollViewDidScroll:(UIScrollView *)scrollView {
  471 +//
  472 +// if (scrollView == self.tbv)
  473 +// {
  474 +//
  475 +// UITableView *tableview = (UITableView *)scrollView;
  476 +//
  477 +// CGFloat sectionHeaderHeight = 6;
  478 +//
  479 +// CGFloat sectionFooterHeight = 200;
  480 +//
  481 +// CGFloat offsetY = tableview.contentOffset.y;
  482 +//
  483 +// if (offsetY >= 0 && offsetY <= sectionHeaderHeight)
  484 +//
  485 +// {
  486 +//
  487 +// tableview.contentInset = UIEdgeInsetsMake(-offsetY, 0, -sectionFooterHeight, 0);
  488 +//
  489 +// }else if (offsetY >= sectionHeaderHeight && offsetY <= tableview.contentSize.height - tableview.frame.size.height - sectionFooterHeight)
  490 +//
  491 +// {
  492 +//
  493 +// tableview.contentInset = UIEdgeInsetsMake(-sectionHeaderHeight, 0, -sectionFooterHeight, 0);
  494 +//
  495 +// }else if (offsetY >= tableview.contentSize.height - tableview.frame.size.height - sectionFooterHeight && offsetY <= tableview.contentSize.height - tableview.frame.size.height) {
  496 +//
  497 +// tableview.contentInset = UIEdgeInsetsMake(-offsetY, 0, -(tableview.contentSize.height - tableview.frame.size.height - sectionFooterHeight), 0);
  498 +//
  499 +// }
  500 +//
  501 +// }
  502 +//
  503 +//}
398 504 - (void)didReceiveMemoryWarning {
399 505 [super didReceiveMemoryWarning];
  506 + // Dispose of any resources that can be recreated.
400 507 }
401 508  
  509 +/*
  510 + #pragma mark - Navigation
  511 +
  512 + // In a storyboard-based application, you will often want to do a little preparation before navigation
  513 + - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
  514 + // Get the new view controller using [segue destinationViewController].
  515 + // Pass the selected object to the new view controller.
  516 + }
  517 + */
  518 +
402 519 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/RegisterCommonController.m
  View file @6137bf4
... ... @@ -8,6 +8,7 @@
8 8  
9 9 #import "RegisterCommonController.h"
10 10 #import "RegistBasicInformationView.h"
  11 +#import "LVCWebViewController.h"
11 12  
12 13 @interface RegisterCommonController ()
13 14 {
... ... @@ -153,6 +154,14 @@
153 154 button.selected = !button.selected;
154 155 }
155 156  
  157 +- (void)userServiceTermsBtnAction:(UIButton *)button
  158 +{
  159 + LVCWebViewController *VC = [[LVCWebViewController alloc] init];
  160 + VC.url = uploadServiceProtocol;
  161 + VC.title = @"视讯中国充值协议";
  162 + [self.navigationController pushViewController:VC animated:YES];
  163 +}
  164 +
156 165 - (void)loginBtnAction
157 166 {
158 167  
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCLoginShowView.m
  View file @6137bf4
... ... @@ -31,7 +31,6 @@
31 31 self.userInteractionEnabled = YES;
32 32 self.autoresizingMask = UIViewAutoresizingFlexibleTopMargin;
33 33 self.contentMode = UIViewContentModeScaleToFill;
34   - //self.autoresizesSubviews = YES;//让子类自动布局
35 34 self.autoresizesSubviews = YES;//让子类自动布局
36 35 [self bindView];
37 36 [self bindAction];
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCMineShowCell.m
  View file @6137bf4
... ... @@ -108,6 +108,8 @@
108 108 }
109 109 - (void)setNotification
110 110 {
  111 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:ThirdLoginSuccess object:nil];
  112 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginFailure) name:ThirdLoginFailure object:nil];
111 113 }
112 114  
113 115 - (void)loginSuccess
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCPersonCommonCell.h
  View file @6137bf4
... ... @@ -7,7 +7,7 @@
7 7 //
8 8  
9 9 #import "BaseTableViewCell.h"
10   -//@class UserInfoModel;
  10 +
11 11 @class UserInformationModel;
12 12 typedef enum {
13 13 PersonalCellTypeIcon = 10,
... ... @@ -22,5 +22,4 @@ typedef enum {
22 22 @property (nonatomic ,strong) UIImageView *iconImageView;
23 23 @property (nonatomic) PersonalCellType type;
24 24  
25   -//- (void)loadUIWithModel:(id)model;
26 25 @end
... ...
LiveVideoCloud/Classes/Sections/Mine/Views/LVCPersonalImageCell.h deleted 100644 → 0
  View file @65cd56a
1   -//
2   -// LVCPersonalImageCell.h
3   -// LiveVideoCloud
4   -//
5   -// Created by cnlive on 17/4/11.
6   -// Copyright © 2017年 CNLive. All rights reserved.
7   -//
8   -
9   -#import "BaseTableViewCell.h"
10   -
11   -@interface LVCPersonalImageCell : BaseTableViewCell
12   -
13   -@end
LiveVideoCloud/Classes/Sections/Mine/Views/LVCPersonalImageCell.m deleted 100644 → 0
  View file @65cd56a
1   -//
2   -// LVCPersonalImageCell.m
3   -// LiveVideoCloud
4   -//
5   -// Created by cnlive on 17/4/11.
6   -// Copyright © 2017年 CNLive. All rights reserved.
7   -//
8   -
9   -#import "LVCPersonalImageCell.h"
10   -
11   -@implementation LVCPersonalImageCell
12   -
13   -@end
LiveVideoCloud/Info.plist
  View file @6137bf4
... ... @@ -26,9 +26,11 @@
26 26 <true/>
27 27 </dict>
28 28 <key>NSCameraUsageDescription</key>
29   - <string></string>
  29 + <string>App需要您的同意,才能访问相机</string>
  30 + <key>NSPhotoLibraryUsageDescription</key>
  31 + <string>App 需要您的同意,才能读取媒体资料库</string>
30 32 <key>NSMicrophoneUsageDescription</key>
31   - <string></string>
  33 + <string>App需要您的同意,才能访问麦克风</string>
32 34 <key>UILaunchStoryboardName</key>
33 35 <string>LaunchScreen</string>
34 36 <key>UIRequiredDeviceCapabilities</key>
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_camera.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_camera_sel.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_home.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_home_sel.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_live_tv.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_live_tv_sel.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_person.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_person_sel.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_videocam.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/ic_videocam_sel.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/live_default.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...
LiveVideoCloud/animation.xcassets/tabBar/news_default.imageset/Contents.json
  View file @6137bf4
... ... @@ -17,5 +17,8 @@
17 17 "info" : {
18 18 "version" : 1,
19 19 "author" : "xcode"
  20 + },
  21 + "properties" : {
  22 + "template-rendering-intent" : "original"
20 23 }
21 24 }
22 25 \ No newline at end of file
... ...