Skip to content

Z
ZhiJi-Overseas
Commit 7d1f2288 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

no message

parent 684ba8e8
Show whitespace changes
Inline Side-by-side
Showing with 195 additions and 8 deletions
ZhiJi.xcodeproj/project.pbxproj
View file @ 7d1f2288
......@@ -58,6 +58,7 @@
A95590932490AE3C00F3BB41 /* QJGIFView.m in Sources */ = {isa = PBXBuildFile; fileRef = A955908D2490AE3C00F3BB41 /* QJGIFView.m */; };
A95590942490AE3C00F3BB41 /* MBProgressHUD+MJ.m in Sources */ = {isa = PBXBuildFile; fileRef = A955908E2490AE3C00F3BB41 /* MBProgressHUD+MJ.m */; };
A95590952490AE3C00F3BB41 /* MBProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A95590902490AE3C00F3BB41 /* MBProgressHUD.bundle */; };
A95AE9D624B0821700A87960 /* JXGuideFigureShowVC.m in Sources */ = {isa = PBXBuildFile; fileRef = A95AE9D524B0821700A87960 /* JXGuideFigureShowVC.m */; };
A95BD56524AC3C7200962B06 /* ZJAreaCodeSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD56424AC3C7200962B06 /* ZJAreaCodeSearchVC.m */; };
A95BD56F24AC3FB200962B06 /* ZJAreaCodeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD56E24AC3FB200962B06 /* ZJAreaCodeModel.m */; };
A95BD57324AC460600962B06 /* ZJAreaCodeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD57124AC460600962B06 /* ZJAreaCodeCell.m */; };
......@@ -280,6 +281,8 @@
A955908E2490AE3C00F3BB41 /* MBProgressHUD+MJ.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MBProgressHUD+MJ.m"; sourceTree = "<group>"; };
A955908F2490AE3C00F3BB41 /* QJGIFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QJGIFView.h; sourceTree = "<group>"; };
A95590902490AE3C00F3BB41 /* MBProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MBProgressHUD.bundle; sourceTree = "<group>"; };
A95AE9D424B0821700A87960 /* JXGuideFigureShowVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JXGuideFigureShowVC.h; sourceTree = "<group>"; };
A95AE9D524B0821700A87960 /* JXGuideFigureShowVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JXGuideFigureShowVC.m; sourceTree = "<group>"; };
A95BD56324AC3C7200962B06 /* ZJAreaCodeSearchVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJAreaCodeSearchVC.h; sourceTree = "<group>"; };
A95BD56424AC3C7200962B06 /* ZJAreaCodeSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJAreaCodeSearchVC.m; sourceTree = "<group>"; };
A95BD56D24AC3FB200962B06 /* ZJAreaCodeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJAreaCodeModel.h; sourceTree = "<group>"; };
......@@ -716,6 +719,8 @@
A948C4FF249B884900C22D69 /* Controller */ = {
isa = PBXGroup;
children = (
A95AE9D424B0821700A87960 /* JXGuideFigureShowVC.h */,
A95AE9D524B0821700A87960 /* JXGuideFigureShowVC.m */,
A9619E8F24AB3662009A2012 /* ZJMemberPayViewController.h */,
A9619E9024AB3662009A2012 /* ZJMemberPayViewController.m */,
68F6DEB42499CA940034F8D5 /* ZJZhiFuViewController.h */,
......@@ -1572,6 +1577,7 @@
A95F5C8F248DDE81001DB97E /* BaseTabBarViewController.m in Sources */,
A95F5C94248DDE81001DB97E /* APPTabBar.swift in Sources */,
A95BD56524AC3C7200962B06 /* ZJAreaCodeSearchVC.m in Sources */,
A95AE9D624B0821700A87960 /* JXGuideFigureShowVC.m in Sources */,
A948C4742493287200C22D69 /* ZJUserInfoManager.m in Sources */,
A95F5C7D248DDE81001DB97E /* ZJSettingViewController.m in Sources */,
A948C4AE2493B31E00C22D69 /* ZJUpdateNickNameView.m in Sources */,
......
ZhiJi/AppDelegate.m
View file @ 7d1f2288
......@@ -31,7 +31,9 @@
[self initializeIQKeyboardManager];
// 501f8a894329f4b57bbfee208a11676f
[AMapServices sharedServices].apiKey = @"31b57777dd1b5f65e45c1dab247e3950";
// 9a9c6434d4271697fec9907d34722969
// 31b57777dd1b5f65e45c1dab247e3950
[AMapServices sharedServices].apiKey = @"9a9c6434d4271697fec9907d34722969";
[AMapServices sharedServices].enableHTTPS = YES;
[[FBSDKApplicationDelegate sharedInstance] application:application
......@@ -50,9 +52,9 @@
self.window = [[UIWindow alloc] init];
self.window.frame = [UIScreen mainScreen].bounds;
self.window.backgroundColor = [UIColor whiteColor];
// self.window.rootViewController = [[GuideViewController alloc] init];
//guide setting
// [ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
self.window.rootViewController = [UIViewController new];
// guide setting
[ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
[self.window makeKeyAndVisible];
......
ZhiJi/Classes/Goods/Controller/JXGuideFigureShowVC.h 0 → 100644
View file @ 7d1f2288
//
// JXGuideFigureShowVC.h
// JXLeadImagesTool
//
// Created by 张明辉 on 16/6/7.
// Copyright © 2016年 jesse. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface JXGuideFigureShowVC : UIViewController
//images
@property (nonatomic,strong) NSArray *images;
//click
@property (nonatomic,strong) void (^clickLastPage) ();
/**
* pagecontrol的属性
*/
@property (nonatomic) float originY;
@property (nonatomic,strong) UIColor *currentPageColor;
@property (nonatomic,strong) UIColor *otherPageColor;
@end
ZhiJi/Classes/Goods/Controller/JXGuideFigureShowVC.m 0 → 100644
View file @ 7d1f2288
//
// JXGuideFigureShowVC.m
// JXLeadImagesTool
//
// Created by 张明辉 on 16/6/7.
// Copyright © 2016年 jesse. All rights reserved.
//
#import "JXGuideFigureShowVC.h"
@interface JXGuideFigureShowVC ()<UIScrollViewDelegate>
@property (nonatomic,strong) UIPageControl *pageControl;
@end
@implementation JXGuideFigureShowVC
- (void)viewDidLoad {
[super viewDidLoad];
//设置界面
[self setupView];
}
- (void)setupView {
self.view.backgroundColor = [UIColor whiteColor];
UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
scrollView.contentSize = CGSizeMake(self.images.count * SCREEN_WIDTH, SCREEN_HEIGHT);
scrollView.delegate = self;
scrollView.showsHorizontalScrollIndicator = NO;
scrollView.pagingEnabled = YES;
scrollView.bounces = NO;
[self.view addSubview:scrollView];
for (int i = 0; i < self.images.count; i ++) {
UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
btn.frame = CGRectMake(i * SCREEN_WIDTH, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
[btn setBackgroundImage:[UIImage imageNamed:self.images[i]] forState:UIControlStateNormal];
[btn setBackgroundImage:[UIImage imageNamed:self.images[i]] forState:UIControlStateHighlighted];
if (i == self.images.count - 1) {
// [btn addTarget:self action:@selector(clickLastBtn) forControlEvents:UIControlEventTouchUpInside];
UIButton * backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
backBtn.frame = CGRectMake(SCREEN_WIDTH/3, SCREEN_HEIGHT - (SCREEN_HEIGHT/667)*100 , SCREEN_WIDTH/3, (SCREEN_HEIGHT/667)*30);
[backBtn setBackgroundImage:[UIImage imageNamed:@"guide_button"] forState:UIControlStateNormal];
[backBtn addTarget:self action:@selector(clickLastBtn) forControlEvents:UIControlEventTouchUpInside];
[btn addSubview:backBtn];
}
[scrollView addSubview:btn];
}
/**
UIPageControl
*/
self.pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, self.originY, SCREEN_WIDTH, 20)];
self.pageControl.enabled = NO;
self.pageControl.numberOfPages = self.images.count;
self.pageControl.currentPageIndicatorTintColor = self.currentPageColor;
self.pageControl.pageIndicatorTintColor = self.otherPageColor;
[self.view addSubview:self.pageControl];
}
- (void)clickLastBtn
{
if (self.clickLastPage) {
self.clickLastPage();
}
}
#pragma mark - scrollview delegate
-(void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
{
int page = scrollView.contentOffset.x / SCREEN_WIDTH;
self.pageControl.currentPage = page;
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
ZhiJi/Classes/Goods/Controller/ZJMemberPayViewController.h
View file @ 7d1f2288
......@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface ZJMemberPayViewController : BaseViewController
@property (nonatomic,strong) NSArray *images;
@property (nonatomic, copy) void(^payFinish)(void);
@property (nonatomic, copy) void(^clickCallBack)(BOOL);
......
ZhiJi/Classes/Goods/Controller/ZJMemberPayViewController.m
View file @ 7d1f2288
......@@ -11,7 +11,7 @@
#import <StoreKit/StoreKit.h>
#import "ZhiJi-Swift.h"
@interface ZJMemberPayViewController ()
@interface ZJMemberPayViewController ()<UIScrollViewDelegate>
@property (nonatomic, weak) IBOutlet UITableView * tableView;
......@@ -26,6 +26,15 @@
@property (nonatomic, copy) NSString *productID;
@property (nonatomic, strong) ZJIPAProductModel *currentProduct;
@property (nonatomic,strong) UIPageControl *pageControl;
/**
* pagecontrol的属性
*/
@property (nonatomic) float originY;
@property (nonatomic,strong) UIColor *currentPageColor;
@property (nonatomic,strong) UIColor *otherPageColor;
@end
@implementation ZJMemberPayViewController
......@@ -38,6 +47,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
[self setUI];
[self setupView];
[self getIpaList];
[self logCollection];
......@@ -60,6 +70,8 @@
_tableView.tableHeaderView = _headerView;
_tableView.tableFooterView = _footerView;
_tableView.hidden = YES;
if (@available(iOS 11.0, *)) {
self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
} else {
......@@ -67,6 +79,45 @@
}
}
- (void)setupView {
self.images = @[@"guide_1", @"guide_1", @"guide_1"];
self.view.backgroundColor = [UIColor whiteColor];
UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
scrollView.contentSize = CGSizeMake(self.images.count * KScreenWidth, KScreenHeight);
scrollView.delegate = self;
scrollView.showsHorizontalScrollIndicator = NO;
scrollView.pagingEnabled = YES;
scrollView.bounces = NO;
[self.view addSubview:scrollView];
[self.view sendSubviewToBack:scrollView];
for (int i = 0; i < self.images.count; i ++) {
UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
btn.frame = CGRectMake(i * KScreenWidth, 0, KScreenWidth, KScreenHeight);
[btn setBackgroundImage:[UIImage imageNamed:self.images[i]] forState:UIControlStateNormal];
[btn setBackgroundImage:[UIImage imageNamed:self.images[i]] forState:UIControlStateHighlighted];
if (i == self.images.count - 1) {
// [btn addTarget:self action:@selector(clickLastBtn) forControlEvents:UIControlEventTouchUpInside];
UIButton * backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
backBtn.frame = CGRectMake(KScreenWidth/3, KScreenHeight - (KScreenHeight/667)*100 , KScreenWidth/3, (KScreenHeight/667)*30);
[backBtn setBackgroundImage:[UIImage imageNamed:@"guide_button"] forState:UIControlStateNormal];
// [backBtn addTarget:self action:@selector(clickLastBtn) forControlEvents:UIControlEventTouchUpInside];
[btn addSubview:backBtn];
}
[scrollView addSubview:btn];
}
/**
UIPageControl
*/
self.pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, KScreenHeight-self.originY-Bottom_Space-20, KScreenWidth, 20)];
self.pageControl.enabled = NO;
self.pageControl.numberOfPages = self.images.count;
self.pageControl.currentPageIndicatorTintColor = self.currentPageColor?:kColorWithRGB(255, 255, 255);
self.pageControl.pageIndicatorTintColor = self.otherPageColor?:kColorWithRGB(0, 0, 0);
[self.view addSubview:self.pageControl];
}
- (IBAction)confirmBtnClick:(id)sender{
NSString *productId = self.currentProduct.productId;
......@@ -163,5 +214,17 @@
return 0;
}
- (void)clickLastBtn{
// if (self.clickLastPage) {
// self.clickLastPage();
// }
}
#pragma mark - scrollview delegate
-(void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{
int page = scrollView.contentOffset.x / SCREEN_WIDTH;
self.pageControl.currentPage = page;
}
@end
ZhiJi/Classes/Main/Base/BaseNavigationViewController.m
View file @ 7d1f2288
......@@ -18,7 +18,7 @@
//presentVC FullScreen
- (UIModalPresentationStyle)modalPresentationStyle{
return UIModalPresentationFullScreen;
return UIModalPresentationOverFullScreen;
}
- (void)viewDidLoad {
......
ZhiJi/Classes/Main/Base/BaseViewController.m
View file @ 7d1f2288
......@@ -20,6 +20,11 @@
@implementation BaseViewController
//presentVC FullScreen
- (UIModalPresentationStyle)modalPresentationStyle{
return UIModalPresentationOverFullScreen;
}
#pragma mark - 生命周期
- (instancetype)init {
......
ZhiJi/Classes/Main/Controller/ZJBaseViewController.m
View file @ 7d1f2288
......@@ -16,7 +16,7 @@
//presentVC FullScreen
- (UIModalPresentationStyle)modalPresentationStyle{
return UIModalPresentationFullScreen;
return UIModalPresentationOverFullScreen;
}
- (void)viewDidLoad {
......
ZhiJi/Classes/Main/Controller/ZJNavViewController.m
View file @ 7d1f2288
......@@ -16,7 +16,7 @@
//presentVC FullScreen
- (UIModalPresentationStyle)modalPresentationStyle{
return UIModalPresentationFullScreen;
return UIModalPresentationOverFullScreen;
}
- (void)viewDidLoad {
......
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