diff --git a/.DS_Store b/.DS_Store index 8028446..4d836a4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index d2b4433..f062573 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -17543,9 +17543,9 @@ CLANG_CXX_LIBRARY = "compiler-default"; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -17640,8 +17640,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "eeefa590-8286-4301-b6e5-f1eeee0de64f"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution; TARGETED_DEVICE_FAMILY = 1; USER_HEADER_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 631dab8..d5dc0b5 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - 爱鱼奇 + 爱鱼奇TEST CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.9.0 + 4.9.1 CFBundleSignature ???? CFBundleURLTypes diff --git a/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m b/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m index c1d59bb..7a17aa1 100644 --- a/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m @@ -35,6 +35,15 @@ [self loadRightData]; } +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + self.navigationController.navigationBar.translucent = YES; +} + +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + self.navigationController.navigationBar.translucent = NO; +} -(void)creatSubViews { diff --git a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m index 5b23858..c1051fa 100644 --- a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m @@ -26,7 +26,7 @@ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; @@ -37,7 +37,7 @@ [self.view addSubview:self.tableView]; UIButton *duiHuanBtn=[UIButton buttonWithType:UIButtonTypeCustom]; - duiHuanBtn.frame = CGRectMake(0, self.view.frame.size.height -49, self.view.frame.size.width, 49); + duiHuanBtn.frame = CGRectMake(0, 0, self.view.frame.size.width, 49); [duiHuanBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:@"立即兑换"]; @@ -47,9 +47,7 @@ [duiHuanBtn setAttributedTitle:title forState:UIControlStateNormal]; [duiHuanBtn setBackgroundColor:RGB(67, 186, 255)]; [duiHuanBtn addTarget:self action:@selector(duihuanBtnClick) forControlEvents:UIControlEventTouchUpInside]; - - [self.view addSubview:duiHuanBtn]; - + self.tableView.tableFooterView = duiHuanBtn; } @@ -87,17 +85,6 @@ return 470; } --(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - - return 0.1; -} - --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - - return 10; - -} - #pragma mark -金币兑换 -(void)duihuanBtnClick{ diff --git a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m index b85aa42..8988be3 100644 --- a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m @@ -15,6 +15,7 @@ @property(nonatomic,strong)UITableView *tableView; @property(nonatomic,strong)NSMutableArray *dataArr; @property (nonatomic) NSIndexPath *selectIndexPath; +@property(nonatomic,strong) UIView *sectionHeaderView; @property (nonatomic) BOOL isChage; @end @@ -57,7 +58,7 @@ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; @@ -99,13 +100,26 @@ -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.1; + return CGFLOAT_MIN; +} + +-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { + return nil; } -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - - return 0.1; - + return 10; +} + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + return self.sectionHeaderView; +} + +-(UIView *)sectionHeaderView { + if (!_sectionHeaderView) { + _sectionHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)]; + } + return _sectionHeaderView; } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m index 1cfce20..5037b75 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m @@ -17,6 +17,7 @@ const float ActivityPageSize = 20; @property (nonatomic,strong) UITableView *tableView; @property (nonatomic,strong) NSMutableArray *dataArr; @property (nonatomic,strong) NSMutableArray *activTypes; +@property (nonatomic,strong) UIView *sectionHeaderView; @property (nonatomic) NSInteger firstResult; @property(nonatomic,copy) NSString* total; @property(nonatomic)BOOL isLoadMore; @@ -87,7 +88,7 @@ const float ActivityPageSize = 20; -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; @@ -127,18 +128,27 @@ const float ActivityPageSize = 20; } -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - - if (section==0) { - return 0.01; - }else{ - - return 10; - } + return 10; +} + +-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + return self.sectionHeaderView; } -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.01; + return CGFLOAT_MIN; +} + +-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ + return nil; +} + +-(UIView *)sectionHeaderView{ + if (!_sectionHeaderView) { + _sectionHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)]; + } + return _sectionHeaderView; } -(void)creatReatRefreshView{ diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib index d316614..7ee6563 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib +++ b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib @@ -1,12 +1,11 @@ - + - - + @@ -16,18 +15,18 @@ - + - + - +