Commit 7ed20373 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com

Merge branch 'lmj_branch' into lmj_branch_unuse

parents c0eb4eff 65e8c82c
......@@ -1642,7 +1642,7 @@
CODE_SIGN_ENTITLEMENTS = superCleaner/superCleaner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEVELOPMENT_TEAM = 443AN53DBQ;
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
......@@ -1677,7 +1677,7 @@
CODE_SIGN_ENTITLEMENTS = superCleaner/superCleaner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEVELOPMENT_TEAM = 443AN53DBQ;
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
......
......@@ -50,8 +50,6 @@
@{@"image":@"home_cell_7", @"title":@"相册统计", @"details":@"种类占比"}];
[self setupUI];
// [self getDivceSize];
// [self rotateAction];
[[ICUserManager shared] loginAndGetUserInfo:^(ZTUserInfoModel * _Nonnull model) {
[[ICUserManager shared] getServiceInfo];
......@@ -343,14 +341,14 @@
break;
case 4:
{
// if ([ICUserManager shared].isMember) {
if ([ICUserManager shared].isMember) {
ICNetworkSpeedViewController *vc = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICNetworkSpeedViewController"];
[self.navigationController pushViewController:vc animated:true];
// }else {
// ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
// ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
// [self presentViewController:navc animated:true completion:nil];
// }
}else {
ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
[self presentViewController:navc animated:true completion:nil];
}
}
break;
case 5:
......@@ -367,14 +365,8 @@
break;
case 6:
{
// if ([ICUserManager shared].isMember) {
ICBatteryCareViewController *vc = [[ICBatteryCareViewController alloc] init];
[self.navigationController pushViewController:vc animated:true];
// }else {
// ICIAPViewController *iapVC = [[UIStoryboard storyboardWithName:@"Main" bundle: nil] instantiateViewControllerWithIdentifier:@"ICIAPViewController"];
// ICNavigationController *navc = [[ICNavigationController alloc] initWithRootViewController:iapVC];
// [self presentViewController:navc animated:true completion:nil];
// }
}
break;
case 7:{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment