Skip to content

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

no message

parent d60494c2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 337 additions and 455 deletions
ZhiJi.xcodeproj/project.pbxproj
View file @ f7f4f972
......@@ -58,7 +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 */; };
A95AE9D924B1A0C700A87960 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A95AE9D724B1A0C700A87960 /* SceneDelegate.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 */; };
......@@ -77,7 +77,6 @@
A95BD59D24ACBF0100962B06 /* Location.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A95BD59F24ACBF0100962B06 /* Location.storyboard */; };
A95BD5AE24AD8E8D00962B06 /* AESCipher.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD5AC24AD8E8D00962B06 /* AESCipher.m */; };
A95BD5B924AE0DEE00962B06 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A95BD5B824AE0DEE00962B06 /* libsqlite3.0.tbd */; };
A95BD5C124AF0EDB00962B06 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD5BF24AF0EDB00962B06 /* SceneDelegate.m */; };
A95F5C58248DDE81001DB97E /* UIButton+HExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F5BC3248DDE81001DB97E /* UIButton+HExtension.m */; };
A95F5C59248DDE81001DB97E /* NSArray+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F5BC4248DDE81001DB97E /* NSArray+Category.m */; };
A95F5C5A248DDE81001DB97E /* UIControl+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F5BC5248DDE81001DB97E /* UIControl+Extension.m */; };
......@@ -281,8 +280,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>"; };
A95AE9D724B1A0C700A87960 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
A95AE9D824B1A0C700A87960 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; 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>"; };
......@@ -318,8 +317,6 @@
A95BD5AC24AD8E8D00962B06 /* AESCipher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AESCipher.m; sourceTree = "<group>"; };
A95BD5AD24AD8E8D00962B06 /* AESCipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AESCipher.h; sourceTree = "<group>"; };
A95BD5B824AE0DEE00962B06 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
A95BD5BF24AF0EDB00962B06 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
A95BD5C024AF0EDB00962B06 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
A95F5BBF248DDE80001DB97E /* UIButton+ImageTitleSpacing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+ImageTitleSpacing.h"; sourceTree = "<group>"; };
A95F5BC0248DDE80001DB97E /* UIView+HExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+HExtension.h"; sourceTree = "<group>"; };
A95F5BC1248DDE80001DB97E /* UIColor+HExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+HExtension.h"; sourceTree = "<group>"; };
......@@ -581,8 +578,8 @@
A95F5BBB248DDE80001DB97E /* Classes */,
686A7C972487644600C7200C /* AppDelegate.h */,
686A7C982487644600C7200C /* AppDelegate.m */,
A95BD5C024AF0EDB00962B06 /* SceneDelegate.h */,
A95BD5BF24AF0EDB00962B06 /* SceneDelegate.m */,
A95AE9D824B1A0C700A87960 /* SceneDelegate.h */,
A95AE9D724B1A0C700A87960 /* SceneDelegate.m */,
F733B0FE249E3F5F00C30230 /* launch1@2x.png */,
F733B0FB249E3F5F00C30230 /* launch1@3x.png */,
F733B0FD249E3F5F00C30230 /* launch2@2x.png */,
......@@ -719,8 +716,6 @@
A948C4FF249B884900C22D69 /* Controller */ = {
isa = PBXGroup;
children = (
A95AE9D424B0821700A87960 /* JXGuideFigureShowVC.h */,
A95AE9D524B0821700A87960 /* JXGuideFigureShowVC.m */,
A9619E8F24AB3662009A2012 /* ZJMemberPayViewController.h */,
A9619E9024AB3662009A2012 /* ZJMemberPayViewController.m */,
68F6DEB42499CA940034F8D5 /* ZJZhiFuViewController.h */,
......@@ -1540,7 +1535,6 @@
D5271EC7248FBD9C00F8B107 /* CollectionViewReusableViewType.swift in Sources */,
A948C4D42497129100C22D69 /* ZJLocationModel.m in Sources */,
A95F5C67248DDE81001DB97E /* UIButton+Category.m in Sources */,
A95BD5C124AF0EDB00962B06 /* SceneDelegate.m in Sources */,
A95BD57324AC460600962B06 /* ZJAreaCodeCell.m in Sources */,
A95F5C7F248DDE81001DB97E /* ZJMineCellModel.m in Sources */,
A95F5C9C248DE232001DB97E /* KeychainItemWrapper.m in Sources */,
......@@ -1554,6 +1548,7 @@
A95BD59324AC500A00962B06 /* ChineseToPinyinResource.m in Sources */,
A95BD59024AC500A00962B06 /* ChineseInclude.m in Sources */,
A95BD59724AC500A00962B06 /* UIAlertController+HCAdd.m in Sources */,
A95AE9D924B1A0C700A87960 /* SceneDelegate.m in Sources */,
A9F91E28249CCA4B006157BF /* ZJUpgradeAlertView.m in Sources */,
A95F5C7C248DDE81001DB97E /* ZJMineViewController.m in Sources */,
A95BD59524AC500A00962B06 /* PinYinForObjc.m in Sources */,
......@@ -1577,7 +1572,6 @@
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.h
View file @ f7f4f972
......@@ -10,7 +10,7 @@
@interface AppDelegate : UIResponder <UIApplicationDelegate>
@property (strong, nonatomic) UIWindow * window;
//@property (strong, nonatomic) UIWindow * window;
@end
ZhiJi/AppDelegate.m
View file @ f7f4f972
......@@ -52,7 +52,7 @@
self.window = [[UIWindow alloc] init];
self.window.frame = [UIScreen mainScreen].bounds;
self.window.backgroundColor = [UIColor whiteColor];
self.window.rootViewController = [UIViewController new];
// self.window.rootViewController = [[BaseViewController alloc] init];
// guide setting
// [ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
......
ZhiJi/Assets.xcassets/Care/care_style2/care_style2_table_header_locationPoint.imageset/Contents.json
View file @ f7f4f972
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon@2x.png",
"filename" : "location@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon@3x.png",
"filename" : "location@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/Care/home_notification_icon.imageset/Contents.json
View file @ f7f4f972
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "home_notification_icon@2x.png",
"filename" : "11@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_notification_icon@3x.png",
"filename" : "11@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/Login/login_phone_textField_bg.imageset/Contents.json → ZhiJi/Assets.xcassets/Goods/guide/goods_guide_0.imageset/Contents.json
View file @ f7f4f972
......@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
"filename" : "矩形 2 拷贝@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "1x副本-3.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/TianJia/头图.imageset/Contents.json → ZhiJi/Assets.xcassets/Goods/guide/goods_guide_1.imageset/Contents.json
View file @ f7f4f972
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "头图@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "头图@3x.png",
"filename" : "2x副本-3.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/Goods/guide/goods_guide_2.imageset/Contents.json 0 → 100644
View file @ f7f4f972
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "3x副本-3.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Goods/guide/goods_guide_3.imageset/Contents.json 0 → 100644
View file @ f7f4f972
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "4x副本.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Goods/guide/goods_guide_confirm.imageset/Contents.json 0 → 100644
View file @ f7f4f972
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "按钮。。。。@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "按钮。。。。@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Login/login_phone_loginBtn_bg.imageset/Contents.json → ZhiJi/Assets.xcassets/Login/login_area_code_arrow.imageset/Contents.json
View file @ f7f4f972
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "登录按钮@2x.png",
"filename" : "Bitmap备份 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "登录按钮@3x.png",
"filename" : "Bitmap备份 2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/Login/login_thirdLogin_arrow.imageset/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "形状 3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "形状 3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Mine/底框(1).imageset/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "底框@2x(1).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "底框@3x(1).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/TianJia/底框 拷贝.imageset/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "底框 拷贝@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "底框 拷贝@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/TianJia/形状 7.imageset/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "形状 7@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "形状 7@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/TianJia/形状 8.imageset/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "形状 8@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "形状 8@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/TianJia/形状 9.imageset/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "形状 9@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "形状 9@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/zhiFu/Contents.json deleted 100644 → 0
View file @ d60494c2
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Classes/Care/Controller/ZJBaseCareViewController.m
View file @ f7f4f972
......@@ -224,9 +224,9 @@
[self.xiaoXiButton setTitleColor:[UIColor colorWithHex:0xffffff] forState:UIControlStateNormal];
[self.xiaoXiButton addTarget:self action:@selector(xiaoXiButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.xiaoXiButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.view).mas_offset(kStatusBarHeight+KScaleWidth(33));
make.top.equalTo(self.view).mas_offset(kStatusBarHeight+KScaleWidth(10));
make.right.equalTo(self.view.mas_right).mas_offset(-KScaleWidth(20));
make.height.width.offset(KScaleWidth(31));
make.height.width.offset(KScaleWidth(24));
}];
_xiaoXiRedPoint = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(8), KScaleWidth(8))];
......
ZhiJi/Classes/Goods/Controller/JXGuideFigureShowVC.h deleted 100644 → 0
View file @ d60494c2
//
// 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 deleted 100644 → 0
View file @ d60494c2
//
// 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.m
View file @ f7f4f972
......@@ -26,14 +26,15 @@
@property (nonatomic, copy) NSString *productID;
@property (nonatomic, strong) ZJIPAProductModel *currentProduct;
@property (nonatomic, strong) UIScrollView * scrollView;
@property (nonatomic,strong) UIPageControl *pageControl;
@property (nonatomic, strong) UIPageControl * pageControl;
/**
* pagecontrol的属性
*/
@property (nonatomic) float originY;
@property (nonatomic,strong) UIColor *currentPageColor;
@property (nonatomic,strong) UIColor *otherPageColor;
@property (nonatomic, strong) UIColor * currentPageColor;
@property (nonatomic, strong) UIColor * otherPageColor;
@end
......@@ -80,42 +81,66 @@
}
- (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];
self.images = @[@"goods_guide_0", @"goods_guide_1", @"goods_guide_2", @"goods_guide_3"];
UIImage * image = [UIImage imageNamed:[self.images firstObject]];
self.scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
self.scrollView.contentSize = CGSizeMake(self.images.count * KScreenWidth, KScreenWidth*image.size.height/image.size.width);
self.scrollView.delegate = self;
self.scrollView.showsHorizontalScrollIndicator = NO;
self.scrollView.showsVerticalScrollIndicator = NO;
self.scrollView.pagingEnabled = YES;
self.scrollView.bounces = NO;
[self.view addSubview:self.scrollView];
[self.view sendSubviewToBack:self.scrollView];
if (@available(iOS 11.0, *)) {
self.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
} else {
self.automaticallyAdjustsScrollViewInsets = NO;
}
for (int i = 0; i < self.images.count; i ++) {
UIImage * image = [UIImage imageNamed:self.images[i]];
UIImageView * imV = [[UIImageView alloc] initWithImage:image];
imV.frame = CGRectMake(i * KScreenWidth, 0, KScreenWidth, KScreenWidth*image.size.height/image.size.width);
imV.userInteractionEnabled = YES;
[self.scrollView addSubview:imV];
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];
btn.frame = CGRectMake((KScreenWidth-KScaleWidth(287))/2, imV.frame.size.height-KScaleWidth(79), KScaleWidth(287), KScaleWidth(69));
[btn setBackgroundImage:[UIImage imageNamed:@"goods_guide_confirm"] forState:UIControlStateNormal];
[btn setBackgroundImage:[UIImage imageNamed:@"goods_guide_confirm"] forState:UIControlStateHighlighted];
[btn addTarget:self action:@selector(confirmBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
// 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];
// }
[imV addSubview:btn];
UILabel * priceLab = [[UILabel alloc] initWithFrame:CGRectMake(0, KScaleWidth(37), btn.frame.size.width, KScaleWidth(14))];
priceLab.textColor = [UIColor whiteColor];
priceLab.font = [UIFont systemFontOfSize:KFont(12)];
priceLab.textAlignment = NSTextAlignmentCenter;
priceLab.tag = 0x64+i;
[btn addSubview:priceLab];
}
/**
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];
// 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{
......@@ -174,6 +199,8 @@
weakSelf.currentProduct = weakSelf.products.firstObject;
weakSelf.orderLab.text = [NSString stringWithFormat:@"%.0f元",weakSelf.currentProduct.cash];
self.productID = weakSelf.currentProduct.productId;
[self updateScrollView:weakSelf.orderLab.text des:nil];
}
} failure:^(NSError * _Nonnull error) {
NSLog(@"error");
......@@ -187,6 +214,7 @@
NSString *labeltext = response[@"result"][@"data"][@"text"];
[self updateFooterView:labeltext];
[self updateScrollView:nil des:labeltext];
}
} failure:^(NSError * _Nonnull error) {
......@@ -194,6 +222,34 @@
}];
}
- (void)updateScrollView:(NSString *)price des:(NSString *)des{
if (price) {
for (int count = 0 ; count < self.images.count ; count++) {
UILabel * lab = [self.scrollView viewWithTag:0x64+count];
lab.text = price;
}
}
if (des) {
CGRect rect = [des boundingRectWithSize:CGSizeMake(KScreenWidth-KScaleWidth(20), MAXFLOAT) options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:KFont(12)]} context:nil];
for (int count = 0 ; count < self.images.count ; count++) {
UILabel * desLab = [[UILabel alloc] initWithFrame:CGRectMake(count*KScreenWidth+KScaleWidth(10), self.scrollView.contentSize.height, KScreenWidth-KScaleWidth(20), rect.size.height)];
desLab.textColor = [UIColor whiteColor];
desLab.text = des;
desLab.numberOfLines = 0;
desLab.font = [UIFont systemFontOfSize:KFont(12)];
[self.scrollView addSubview:desLab];
if (count == self.images.count-1) {
self.scrollView.contentSize = CGSizeMake(self.scrollView.contentSize.width, self.scrollView.contentSize.height+rect.size.height);
self.scrollView.backgroundColor = kColorFromRGB(0x568EFC);
}
}
}
}
- (void)updateFooterView:(NSString *)string{
[self.footerView layoutIfNeeded];
......
ZhiJi/Classes/Goods/Pay.storyboard
View file @ f7f4f972
......@@ -197,7 +197,7 @@
<rect key="frame" x="339" y="49.5" width="59" height="33"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Restore">
<color key="titleColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="restoreBtnClick:" destination="dwu-wn-GXg" eventType="touchUpInside" id="OR2-nw-yS8"/>
......
ZhiJi/Classes/Tools/Guide/ZJGuideConfig.m
View file @ f7f4f972
......@@ -59,6 +59,9 @@
self.currentWindow = window;
self.launchScreen = [[UINib nibWithNibName:@"LaunchScreenPlaceHolderView" bundle:nil] instantiateWithOwner:self options:nil].firstObject;
[window addSubview:self.launchScreen];
UIWindow * v = [[UIApplication sharedApplication] delegate].window;
[self.launchScreen mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.bottom.equalTo(window);
}];
......
ZhiJi/Classes/Tools/PCH/PrefixHeader.pch
View file @ f7f4f972
......@@ -76,7 +76,8 @@ isPhoneX = [[UIApplication sharedApplication] delegate].window.safeAreaInsets.bo
#define KFont(font) (font * (KScreenWidth < 375 ? 0.8 : 1.0))
//色值
#define kColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
#define kColorWithRGB(r, g, b) [UIColor colorWithRed:(r) / 255.f green:(g) / 255.f blue:(b) / 255.f alpha:1.f]
#define kColorWithRGBA(r, g, b, a) [UIColor colorWithRed:(r) / 255.f green:(g) / 255.f blue:(b) / 255.f alpha:(a)]
#define kColorWithRGB(r, g, b) kColorWithRGBA(r, g, b, 1.f)
#define kMassColor kColorWithRGB(86, 142, 252)
#define kLocalizedString(key) NSLocalizedString(key, @"")
......
ZhiJi/SceneDelegate.m
View file @ f7f4f972
......@@ -10,6 +10,7 @@
#import "BaseTabBarViewController.h"
#import "ZJGuideConfig.h"
#import "ZJUserInfoManager.h"
#import "BaseViewController.h"
@interface SceneDelegate ()
......@@ -22,7 +23,7 @@
self.window = [[UIWindow alloc] initWithWindowScene:(UIWindowScene *)scene];
self.window.frame = [UIScreen mainScreen].bounds;
self.window.backgroundColor = [UIColor whiteColor];
// self.window.rootViewController = [[GuideViewController alloc] init];
// self.window.rootViewController = [[BaseViewController alloc] init];
//guide setting
[ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
......
ZhiJi/en.lproj/Localizable.strings
View file @ f7f4f972
......@@ -55,7 +55,7 @@ appName = "Family Mapp";
"login_send_code"="Send confirmation code";
"login_send_code_again"="Resend";
"login_already_send_code"="Send confirmation code";
"login_read"="I accept";
"login_read"="View";
"area"="Select the area";
"area_search"="Search countries or areas";
......@@ -70,7 +70,8 @@ appName = "Family Mapp";
"care_add"="Add";
"care_invite_friends"="Invite friends";
"care_invite_facebook"="Facebook invitation";
"care_invite_facebook"="Invite with Facebook";
"care_no_user"="No user found";
"care_footer_details_0"="Where is my friend?";
"care_footer_details_1"="Enter the number of the location of the friend you want to find and continue";
......@@ -154,7 +155,7 @@ appName = "Family Mapp";
"mine_edit_nickname"="Change username";
"mine_premium_services_locked"="Premium services locked";
"myself"="Myself";
"myself"="Me";
"myself_style2"="Myself";
"mine_free_used"="Free use";
......
ZhiJi/zh-Hans.lproj/Localizable.strings
View file @ f7f4f972
......@@ -54,7 +54,7 @@ appName = "Family Mapp";
"login_send_code"="发送验证码";
"login_already_send_code"="已发送";
"login_send_code_again"="重新发送";
"login_read"="已阅读并同意";
"login_read"="阅读并同意";
"login_sms_code"="请输入短信验证码";
......@@ -69,6 +69,7 @@ appName = "Family Mapp";
"care_add"="添加";
"care_invite_friends"="邀请好友";
"care_invite_facebook"="facebook邀请";
"care_no_user"="未找到用户";
"care_footer_details_0"="我的朋友在哪里?";
"care_footer_details_1"="输入您想要查找的朋友的电话号码";
......
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