Skip to content

Commit

Permalink
implement question animation
Browse files Browse the repository at this point in the history
  • Loading branch information
@DHUsesAll
DHUsesAll committed Jul 22, 2015
1 parent 455ba8c commit 5a1fbb7
Show file tree
Hide file tree
Showing 22 changed files with 377 additions and 62 deletions.
110 changes: 110 additions & 0 deletions DeepBreathing.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,23 @@
E58A546E1B5897A400E5413D /* NetworkingManager+Login.m in Sources */ = {isa = PBXBuildFile; fileRef = E58A546D1B5897A400E5413D /* NetworkingManager+Login.m */; };
E58A54721B58ABCC00E5413D /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E58A54711B58ABCC00E5413D /* RegisterViewController.m */; };
E58A54751B58B07C00E5413D /* DHNavigationBar.m in Sources */ = {isa = PBXBuildFile; fileRef = E58A54741B58B07C00E5413D /* DHNavigationBar.m */; };
E5D5F9E31B5F3EB200D73C0B /* HomePageQuestionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E5D5F9E21B5F3EB200D73C0B /* HomePageQuestionManager.m */; };
E5D5F9F91B5F619400D73C0B /* 对.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9E51B5F619400D73C0B /* 对.png */; };
E5D5F9FA1B5F619400D73C0B /* 对_选中.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9E61B5F619400D73C0B /* 对_选中.png */; };
E5D5F9FB1B5F619400D73C0B /* question1.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9E81B5F619400D73C0B /* question1.png */; };
E5D5F9FC1B5F619400D73C0B /* 杯子.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9EA1B5F619400D73C0B /* 杯子.png */; };
E5D5F9FD1B5F619400D73C0B /* 水.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9EB1B5F619400D73C0B /* 水.png */; };
E5D5F9FE1B5F619400D73C0B /* 缓解药物.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9EC1B5F619400D73C0B /* 缓解药物.png */; };
E5D5F9FF1B5F619400D73C0B /* 药丸.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9ED1B5F619400D73C0B /* 药丸.png */; };
E5D5FA001B5F619400D73C0B /* 分钟.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9EF1B5F619400D73C0B /* 分钟.png */; };
E5D5FA011B5F619400D73C0B /* 夜间症状.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F01B5F619400D73C0B /* 夜间症状.png */; };
E5D5FA021B5F619400D73C0B /* 时钟.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F11B5F619400D73C0B /* 时钟.png */; };
E5D5FA031B5F619400D73C0B /* 秒针.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F21B5F619400D73C0B /* 秒针.png */; };
E5D5FA041B5F619400D73C0B /* 表盘.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F31B5F619400D73C0B /* 表盘.png */; };
E5D5FA051B5F619400D73C0B /* 十字.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F51B5F619400D73C0B /* 十字.png */; };
E5D5FA061B5F619400D73C0B /* 急性发作.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F61B5F619400D73C0B /* 急性发作.png */; };
E5D5FA071B5F619400D73C0B /* 错.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F71B5F619400D73C0B /* 错.png */; };
E5D5FA081B5F619400D73C0B /* 错_选中.png in Resources */ = {isa = PBXBuildFile; fileRef = E5D5F9F81B5F619400D73C0B /* 错_选中.png */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -517,6 +534,24 @@
E58A54731B58B07C00E5413D /* DHNavigationBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DHNavigationBar.h; sourceTree = "<group>"; };
E58A54741B58B07C00E5413D /* DHNavigationBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DHNavigationBar.m; sourceTree = "<group>"; };
E58A54761B58E02B00E5413D /* NetworkingManager_aaa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkingManager_aaa.h; path = DeepBreathing/Tools/NetworkingManager/NetworkingManager_aaa.h; sourceTree = "<group>"; };
E5D5F9E11B5F3EB200D73C0B /* HomePageQuestionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomePageQuestionManager.h; sourceTree = "<group>"; };
E5D5F9E21B5F3EB200D73C0B /* HomePageQuestionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomePageQuestionManager.m; sourceTree = "<group>"; };
E5D5F9E51B5F619400D73C0B /* 对.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "对.png"; sourceTree = "<group>"; };
E5D5F9E61B5F619400D73C0B /* 对_选中.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "对_选中.png"; sourceTree = "<group>"; };
E5D5F9E81B5F619400D73C0B /* question1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = question1.png; sourceTree = "<group>"; };
E5D5F9EA1B5F619400D73C0B /* 杯子.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "杯子.png"; sourceTree = "<group>"; };
E5D5F9EB1B5F619400D73C0B /* 水.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "水.png"; sourceTree = "<group>"; };
E5D5F9EC1B5F619400D73C0B /* 缓解药物.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "缓解药物.png"; sourceTree = "<group>"; };
E5D5F9ED1B5F619400D73C0B /* 药丸.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "药丸.png"; sourceTree = "<group>"; };
E5D5F9EF1B5F619400D73C0B /* 分钟.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "分钟.png"; sourceTree = "<group>"; };
E5D5F9F01B5F619400D73C0B /* 夜间症状.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "夜间症状.png"; sourceTree = "<group>"; };
E5D5F9F11B5F619400D73C0B /* 时钟.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "时钟.png"; sourceTree = "<group>"; };
E5D5F9F21B5F619400D73C0B /* 秒针.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "秒针.png"; sourceTree = "<group>"; };
E5D5F9F31B5F619400D73C0B /* 表盘.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "表盘.png"; sourceTree = "<group>"; };
E5D5F9F51B5F619400D73C0B /* 十字.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "十字.png"; sourceTree = "<group>"; };
E5D5F9F61B5F619400D73C0B /* 急性发作.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "急性发作.png"; sourceTree = "<group>"; };
E5D5F9F71B5F619400D73C0B /* 错.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "错.png"; sourceTree = "<group>"; };
E5D5F9F81B5F619400D73C0B /* 错_选中.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "错_选中.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -862,6 +897,8 @@
children = (
E58A52311B5745B300E5413D /* HomePageViewController.h */,
E58A52321B5745B300E5413D /* HomePageViewController.m */,
E5D5F9E11B5F3EB200D73C0B /* HomePageQuestionManager.h */,
E5D5F9E21B5F3EB200D73C0B /* HomePageQuestionManager.m */,
);
path = "首页";
sourceTree = "<group>";
Expand Down Expand Up @@ -990,6 +1027,7 @@
E58A52BD1B57506A00E5413D /* Images */ = {
isa = PBXGroup;
children = (
E5D5F9E41B5F619400D73C0B /* 题目 */,
E58A52BE1B57506A00E5413D /* Tabbar */,
E58A52C91B57506A00E5413D /* 个人中心 */,
E58A52D71B57506A00E5413D /* 就诊 */,
Expand Down Expand Up @@ -1301,6 +1339,61 @@
path = NetworkingManager;
sourceTree = "<group>";
};
E5D5F9E41B5F619400D73C0B /* 题目 */ = {
isa = PBXGroup;
children = (
E5D5F9E51B5F619400D73C0B /* 对.png */,
E5D5F9E61B5F619400D73C0B /* 对_选中.png */,
E5D5F9E71B5F619400D73C0B /* 第一题 */,
E5D5F9E91B5F619400D73C0B /* 第三题 */,
E5D5F9EE1B5F619400D73C0B /* 第二题 */,
E5D5F9F41B5F619400D73C0B /* 第四题 */,
E5D5F9F71B5F619400D73C0B /* 错.png */,
E5D5F9F81B5F619400D73C0B /* 错_选中.png */,
);
path = "题目";
sourceTree = "<group>";
};
E5D5F9E71B5F619400D73C0B /* 第一题 */ = {
isa = PBXGroup;
children = (
E5D5F9E81B5F619400D73C0B /* question1.png */,
);
path = "第一题";
sourceTree = "<group>";
};
E5D5F9E91B5F619400D73C0B /* 第三题 */ = {
isa = PBXGroup;
children = (
E5D5F9EA1B5F619400D73C0B /* 杯子.png */,
E5D5F9EB1B5F619400D73C0B /* 水.png */,
E5D5F9EC1B5F619400D73C0B /* 缓解药物.png */,
E5D5F9ED1B5F619400D73C0B /* 药丸.png */,
);
path = "第三题";
sourceTree = "<group>";
};
E5D5F9EE1B5F619400D73C0B /* 第二题 */ = {
isa = PBXGroup;
children = (
E5D5F9EF1B5F619400D73C0B /* 分钟.png */,
E5D5F9F01B5F619400D73C0B /* 夜间症状.png */,
E5D5F9F11B5F619400D73C0B /* 时钟.png */,
E5D5F9F21B5F619400D73C0B /* 秒针.png */,
E5D5F9F31B5F619400D73C0B /* 表盘.png */,
);
path = "第二题";
sourceTree = "<group>";
};
E5D5F9F41B5F619400D73C0B /* 第四题 */ = {
isa = PBXGroup;
children = (
E5D5F9F51B5F619400D73C0B /* 十字.png */,
E5D5F9F61B5F619400D73C0B /* 急性发作.png */,
);
path = "第四题";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -1389,19 +1482,24 @@
E58A53811B57506A00E5413D /* 收藏按钮正常.png in Resources */,
E58A53701B57506A00E5413D /* 帮助.png in Resources */,
E58A53881B57506A00E5413D /* 删除按钮.png in Resources */,
E5D5FA021B5F619400D73C0B /* 时钟.png in Resources */,
E58A53B31B57506A00E5413D /* 就诊-提醒.png in Resources */,
E58A53B21B57506A00E5413D /* 完全控制点.png in Resources */,
E58A53A51B57506A00E5413D /* defeat.png in Resources */,
E58A53C51B57506A00E5413D /* 未控制点.png in Resources */,
E58A53931B57506A00E5413D /* 开始评估按钮1.png in Resources */,
E58A539D1B57506A00E5413D /* 评估结果_完全控制背景.png in Resources */,
E5D5FA051B5F619400D73C0B /* 十字.png in Resources */,
E58A53801B57506A00E5413D /* 收藏列表按钮.png in Resources */,
E58A53E01B57506A00E5413D /* 首页部分控制文字.png in Resources */,
E58A536C1B57506A00E5413D /* 首页.png in Resources */,
E58A539A1B57506A00E5413D /* 评估3.png in Resources */,
E58A53731B57506A00E5413D /* 登录密码.png in Resources */,
E5D5FA031B5F619400D73C0B /* 秒针.png in Resources */,
E5D5F9FB1B5F619400D73C0B /* question1.png in Resources */,
E58A53C11B57506A00E5413D /* 返回按钮.png in Resources */,
E58A53C71B57506A00E5413D /* 1.png in Resources */,
E5D5FA011B5F619400D73C0B /* 夜间症状.png in Resources */,
E58A53CF1B57506A00E5413D /* 时间编辑按钮.png in Resources */,
E58A53DF1B57506A00E5413D /* 首页未控制文字4s.png in Resources */,
E58A53AC1B57506A00E5413D /* 历史记录按钮.png in Resources */,
Expand All @@ -1410,6 +1508,7 @@
E58A53661B57506A00E5413D /* 现在就去按钮.png in Resources */,
E58A539F1B57506A00E5413D /* 评估结果_部分控制背景.png in Resources */,
E58A53741B57506A00E5413D /* 登录按钮点击前.png in Resources */,
E5D5FA061B5F619400D73C0B /* 急性发作.png in Resources */,
E58A53CE1B57506A00E5413D /* 搜索框2.png in Resources */,
E58A53B81B57506A00E5413D /* 3比4.png in Resources */,
E58A53BE1B57506A00E5413D /* 扳手.png in Resources */,
Expand Down Expand Up @@ -1444,8 +1543,10 @@
E58A538C1B57506A00E5413D /* 放大镜.png in Resources */,
E58A53C91B57506A00E5413D /* 3.png in Resources */,
E58A53C21B57506A00E5413D /* 我有哮喘按钮.png in Resources */,
E5D5F9FC1B5F619400D73C0B /* 杯子.png in Resources */,
E58A53851B57506A00E5413D /* 知识详情默认图.png in Resources */,
E58A53E21B57506A00E5413D /* sound.mp3 in Resources */,
E5D5F9FA1B5F619400D73C0B /* 对_选中.png in Resources */,
E58A53AF1B57506A00E5413D /* 四周-选中.png in Resources */,
E58A53691B57506A00E5413D /* 确认更换按钮2.png in Resources */,
E58A53D11B57506A00E5413D /* 是_选中.png in Resources */,
Expand All @@ -1461,6 +1562,7 @@
E58A53681B57506A00E5413D /* 确认更换按钮.png in Resources */,
E58A53D71B57506A00E5413D /* 返回_图表.png in Resources */,
E58A53D51B57506A00E5413D /* 进度圆环.png in Resources */,
E5D5F9FE1B5F619400D73C0B /* 缓解药物.png in Resources */,
E58A53A81B57506A00E5413D /* 个人中心按钮.png in Resources */,
E58A53A91B57506A00E5413D /* 其他-评估.png in Resources */,
E58A537F1B57506A00E5413D /* 心-实底.png in Resources */,
Expand All @@ -1473,9 +1575,11 @@
E58A53C01B57506A00E5413D /* 是2.png in Resources */,
E58A537E1B57506A00E5413D /* 哮喘知识默认配图.png in Resources */,
E58A53971B57506A00E5413D /* 查看评估结果完成按钮2.png in Resources */,
E5D5F9FD1B5F619400D73C0B /* 水.png in Resources */,
E58A53BF1B57506A00E5413D /* 是.png in Resources */,
E58A53D41B57506A00E5413D /* 记录-编辑.png in Resources */,
E58A53D91B57506A00E5413D /* 部分控制点.png in Resources */,
E5D5FA081B5F619400D73C0B /* 错_选中.png in Resources */,
E58A539E1B57506A00E5413D /* 评估结果_未得到控制背景.png in Resources */,
E58A53C41B57506A00E5413D /* 未控制人形.png in Resources */,
E58A53621B57506A00E5413D /* 修改个人信息-未选中.png in Resources */,
Expand All @@ -1485,10 +1589,12 @@
E58A53941B57506A00E5413D /* 开始评估按钮2.png in Resources */,
E58A53CD1B57506A00E5413D /* 否_选中.png in Resources */,
E58A53611B57506A00E5413D /* 侧栏背景.png in Resources */,
E5D5F9F91B5F619400D73C0B /* 对.png in Resources */,
E58A538E1B57506A00E5413D /* 添加按钮.png in Resources */,
E58A53561B57506A00E5413D /* 1000-0.png in Resources */,
E58A53901B57506A00E5413D /* 完成按钮1.png in Resources */,
E58A53B91B57506A00E5413D /* 4比4.png in Resources */,
E5D5FA041B5F619400D73C0B /* 表盘.png in Resources */,
E58A53631B57506A00E5413D /* 修改个人信息-选中.png in Resources */,
E58A53BA1B57506A00E5413D /* 保存.png in Resources */,
E58A53B61B57506A00E5413D /* 1比4.png in Resources */,
Expand All @@ -1501,8 +1607,10 @@
E58A537B1B57506A00E5413D /* 删除.png in Resources */,
E58A539B1B57506A00E5413D /* 评估4.png in Resources */,
E58A53AD1B57506A00E5413D /* 历史记录按钮_橘色.png in Resources */,
E5D5FA071B5F619400D73C0B /* 错.png in Resources */,
E58A538D1B57506A00E5413D /* 无序原点.png in Resources */,
E58A53651B57506A00E5413D /* 关于我们.png in Resources */,
E5D5F9FF1B5F619400D73C0B /* 药丸.png in Resources */,
E58A535D1B57506A00E5413D /* 1003-1.png in Resources */,
E58A53841B57506A00E5413D /* 收藏按钮选中后点击.png in Resources */,
E58A53D81B57506A00E5413D /* 部分控制人形.png in Resources */,
Expand All @@ -1516,6 +1624,7 @@
E58A53DC1B57506A00E5413D /* 首页完全控制文字.png in Resources */,
E58A53751B57506A00E5413D /* 登录按钮点击后.png in Resources */,
E58A53A11B57506A00E5413D /* 评估结果页_未得到控制.png in Resources */,
E5D5FA001B5F619400D73C0B /* 分钟.png in Resources */,
E58A53C81B57506A00E5413D /* 2.png in Resources */,
E58A53761B57506A00E5413D /* 登录橘色背景图.png in Resources */,
E58A53641B57506A00E5413D /* 修改密码.png in Resources */,
Expand Down Expand Up @@ -1581,6 +1690,7 @@
E58A545F1B57A44200E5413D /* UIRefreshControl+AFNetworking.m in Sources */,
E58A54571B57A44200E5413D /* AFURLResponseSerialization.m in Sources */,
E58A54511B57A44200E5413D /* AFHTTPRequestOperationManager.m in Sources */,
E5D5F9E31B5F3EB200D73C0B /* HomePageQuestionManager.m in Sources */,
E50905911B5C9551000FB9FE /* DHGradientRoundedProgressView.m in Sources */,
E58A54501B57A44200E5413D /* AFHTTPRequestOperation.m in Sources */,
E556A7CC1B55F89A007CFCF5 /* AppDelegate.m in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion DeepBreathing/AppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <UIKit/UIKit.h>

@interface AppDelegate : UIResponder <UIApplicationDelegate>
@interface AppDelegate : UIResponder <UIApplicationDelegate,UINavigationControllerDelegate>

@property (strong, nonatomic) UIWindow *window;

Expand Down
2 changes: 2 additions & 0 deletions DeepBreathing/PrefixHeader.pch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#define THEME_TEXT_COLOR RGB_COLOR(239, 107, 42)

#import <UIKit/UIKit.h>

#import "UserModel.h"
#import "DHConvenienceAutoLayout.h"
#import "DHFoundationTool.h"
Expand Down
25 changes: 25 additions & 0 deletions DeepBreathing/模块/首页/HomePageQuestionManager.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// HomePageQuestionManager.h
// DeepBreathing
//
// Created by DreamHack on 15-7-22.
// Copyright (c) 2015年 DreamHack. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface HomePageQuestionManager : NSObject

// 4个问题加载到该view上
@property (nonatomic, strong, readonly) UIView * questionContainerView;

// 单例
+ (HomePageQuestionManager *)defaultManager;
// 两个路径
// shapeLayer动画开始路径和结束路径
+ (CGPathRef)pathForStarting;
+ (CGPathRef)pathForEndding;

- (void)didTransitionToQuestion;

@end
Loading

0 comments on commit 5a1fbb7

Please sign in to comment.