diff --git a/ManagerDemo.xcodeproj/project.pbxproj b/ManagerDemo.xcodeproj/project.pbxproj index 07385ab..cbba22f 100644 --- a/ManagerDemo.xcodeproj/project.pbxproj +++ b/ManagerDemo.xcodeproj/project.pbxproj @@ -42,6 +42,16 @@ A94FE520199C9C6800626DE5 /* MoveSocialCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A94FE51F199C9C6800626DE5 /* MoveSocialCellView.xib */; }; A96F2A7C199D008200608237 /* UIButton+Bootstrap.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F2A7B199D008200608237 /* UIButton+Bootstrap.m */; }; A96F2A7F199D01C000608237 /* NSString+FontAwesome.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F2A7E199D01C000608237 /* NSString+FontAwesome.m */; }; + A97F9D1519B592E90073E7E6 /* get_ver_button_gry@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1219B592E90073E7E6 /* get_ver_button_gry@2x.png */; }; + A97F9D1619B592E90073E7E6 /* get_ver_button_red_s@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1319B592E90073E7E6 /* get_ver_button_red_s@2x.png */; }; + A97F9D1719B592E90073E7E6 /* get_ver_button_red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1419B592E90073E7E6 /* get_ver_button_red@2x.png */; }; + A97F9D1A19B592FD0073E7E6 /* login_button_s@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1819B592FD0073E7E6 /* login_button_s@2x.png */; }; + A97F9D1B19B592FD0073E7E6 /* login_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1919B592FD0073E7E6 /* login_button@2x.png */; }; + A97F9D1E19B5931C0073E7E6 /* register_button_s@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1C19B5931C0073E7E6 /* register_button_s@2x.png */; }; + A97F9D1F19B5931C0073E7E6 /* register_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1D19B5931C0073E7E6 /* register_button@2x.png */; }; + A97F9D2319B595550073E7E6 /* InputPassWordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A97F9D2119B595550073E7E6 /* InputPassWordViewController.m */; }; + A97F9D2419B595550073E7E6 /* InputPassWordViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D2219B595550073E7E6 /* InputPassWordViewController.xib */; }; + A97F9D2719B5974B0073E7E6 /* UIUnderlinedButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A97F9D2619B5974B0073E7E6 /* UIUnderlinedButton.m */; }; A986268A19B40AAC00FF9E2C /* SVModalWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A986268619B40AAC00FF9E2C /* SVModalWebViewController.m */; }; A986268B19B40AAC00FF9E2C /* SVWebViewController.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A986268719B40AAC00FF9E2C /* SVWebViewController.bundle */; }; A986268C19B40AAC00FF9E2C /* SVWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A986268919B40AAC00FF9E2C /* SVWebViewController.m */; }; @@ -152,6 +162,13 @@ A9EAA052199879CC001A872A /* pie_chart_center@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9EAA051199879CC001A872A /* pie_chart_center@2x.png */; }; A9EAA05619988C55001A872A /* MRCircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9EAA05519988C55001A872A /* MRCircularProgressView.m */; }; A9EAA05F1998BB82001A872A /* about_dot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9EAA05E1998BB82001A872A /* about_dot@2x.png */; }; + A9EC95B719B54F6E00681678 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9EC95B519B54F6E00681678 /* LoginViewController.m */; }; + A9EC95B819B54F6E00681678 /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9EC95B619B54F6E00681678 /* LoginViewController.xib */; }; + A9EC95BB19B54FDB00681678 /* textField_cancel_ios7_s.png in Resources */ = {isa = PBXBuildFile; fileRef = A9EC95B919B54FDB00681678 /* textField_cancel_ios7_s.png */; }; + A9EC95BC19B54FDB00681678 /* textField_cancel_ios7.png in Resources */ = {isa = PBXBuildFile; fileRef = A9EC95BA19B54FDB00681678 /* textField_cancel_ios7.png */; }; + A9EC95BE19B54FEC00681678 /* textField_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9EC95BD19B54FEC00681678 /* textField_bg@2x.png */; }; + A9EC95C019B5501B00681678 /* icon_phone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9EC95BF19B5501B00681678 /* icon_phone@2x.png */; }; + A9EC95C319B55CF100681678 /* ManagerUser.m in Sources */ = {isa = PBXBuildFile; fileRef = A9EC95C219B55CF100681678 /* ManagerUser.m */; }; A9F1E18619ACB63100B6A441 /* DTCoreTextTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F1E18519ACB63100B6A441 /* DTCoreTextTableViewCell.m */; }; A9F1E18819ACB64D00B6A441 /* DTCoreTextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9F1E18719ACB64D00B6A441 /* DTCoreTextTableViewCell.xib */; }; /* End PBXBuildFile section */ @@ -217,6 +234,18 @@ A96F2A7B199D008200608237 /* UIButton+Bootstrap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Bootstrap.m"; sourceTree = ""; }; A96F2A7D199D01C000608237 /* NSString+FontAwesome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+FontAwesome.h"; sourceTree = ""; }; A96F2A7E199D01C000608237 /* NSString+FontAwesome.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+FontAwesome.m"; sourceTree = ""; }; + A97F9D1219B592E90073E7E6 /* get_ver_button_gry@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "get_ver_button_gry@2x.png"; sourceTree = ""; }; + A97F9D1319B592E90073E7E6 /* get_ver_button_red_s@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "get_ver_button_red_s@2x.png"; sourceTree = ""; }; + A97F9D1419B592E90073E7E6 /* get_ver_button_red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "get_ver_button_red@2x.png"; sourceTree = ""; }; + A97F9D1819B592FD0073E7E6 /* login_button_s@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "login_button_s@2x.png"; sourceTree = ""; }; + A97F9D1919B592FD0073E7E6 /* login_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "login_button@2x.png"; sourceTree = ""; }; + A97F9D1C19B5931C0073E7E6 /* register_button_s@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "register_button_s@2x.png"; sourceTree = ""; }; + A97F9D1D19B5931C0073E7E6 /* register_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "register_button@2x.png"; sourceTree = ""; }; + A97F9D2019B595550073E7E6 /* InputPassWordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputPassWordViewController.h; sourceTree = ""; }; + A97F9D2119B595550073E7E6 /* InputPassWordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputPassWordViewController.m; sourceTree = ""; }; + A97F9D2219B595550073E7E6 /* InputPassWordViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InputPassWordViewController.xib; sourceTree = ""; }; + A97F9D2519B5974B0073E7E6 /* UIUnderlinedButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIUnderlinedButton.h; sourceTree = ""; }; + A97F9D2619B5974B0073E7E6 /* UIUnderlinedButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIUnderlinedButton.m; sourceTree = ""; }; A986268519B40AAC00FF9E2C /* SVModalWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVModalWebViewController.h; sourceTree = ""; }; A986268619B40AAC00FF9E2C /* SVModalWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVModalWebViewController.m; sourceTree = ""; }; A986268719B40AAC00FF9E2C /* SVWebViewController.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SVWebViewController.bundle; sourceTree = ""; }; @@ -366,6 +395,15 @@ A9EAA05419988C55001A872A /* MRCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRCircularProgressView.h; sourceTree = ""; }; A9EAA05519988C55001A872A /* MRCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRCircularProgressView.m; sourceTree = ""; }; A9EAA05E1998BB82001A872A /* about_dot@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "about_dot@2x.png"; sourceTree = ""; }; + A9EC95B419B54F6E00681678 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; + A9EC95B519B54F6E00681678 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = ""; }; + A9EC95B619B54F6E00681678 /* LoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginViewController.xib; sourceTree = ""; }; + A9EC95B919B54FDB00681678 /* textField_cancel_ios7_s.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = textField_cancel_ios7_s.png; sourceTree = ""; }; + A9EC95BA19B54FDB00681678 /* textField_cancel_ios7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = textField_cancel_ios7.png; sourceTree = ""; }; + A9EC95BD19B54FEC00681678 /* textField_bg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "textField_bg@2x.png"; sourceTree = ""; }; + A9EC95BF19B5501B00681678 /* icon_phone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_phone@2x.png"; sourceTree = ""; }; + A9EC95C119B55CF100681678 /* ManagerUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManagerUser.h; sourceTree = ""; }; + A9EC95C219B55CF100681678 /* ManagerUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ManagerUser.m; sourceTree = ""; }; A9F1E18419ACB63100B6A441 /* DTCoreTextTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTCoreTextTableViewCell.h; sourceTree = ""; }; A9F1E18519ACB63100B6A441 /* DTCoreTextTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTCoreTextTableViewCell.m; sourceTree = ""; }; A9F1E18719ACB64D00B6A441 /* DTCoreTextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DTCoreTextTableViewCell.xib; sourceTree = ""; }; @@ -476,6 +514,8 @@ A96F2A7E199D01C000608237 /* NSString+FontAwesome.m */, A96F2A7A199D008200608237 /* UIButton+Bootstrap.h */, A96F2A7B199D008200608237 /* UIButton+Bootstrap.m */, + A97F9D2519B5974B0073E7E6 /* UIUnderlinedButton.h */, + A97F9D2619B5974B0073E7E6 /* UIUnderlinedButton.m */, ); path = UIButtonUtil; sourceTree = ""; @@ -654,6 +694,8 @@ A9AF6C4B19949B7B0076C0EE /* ManagerConstants.h */, A93F87721999AA8300875287 /* ManagerUtil.h */, A93F87731999AA8300875287 /* ManagerUtil.m */, + A9EC95C119B55CF100681678 /* ManagerUser.h */, + A9EC95C219B55CF100681678 /* ManagerUser.m */, ); path = Common; sourceTree = ""; @@ -661,6 +703,17 @@ A9AF6C4D19949CAD0076C0EE /* Resource */ = { isa = PBXGroup; children = ( + A97F9D1C19B5931C0073E7E6 /* register_button_s@2x.png */, + A97F9D1D19B5931C0073E7E6 /* register_button@2x.png */, + A97F9D1819B592FD0073E7E6 /* login_button_s@2x.png */, + A97F9D1919B592FD0073E7E6 /* login_button@2x.png */, + A97F9D1219B592E90073E7E6 /* get_ver_button_gry@2x.png */, + A97F9D1319B592E90073E7E6 /* get_ver_button_red_s@2x.png */, + A97F9D1419B592E90073E7E6 /* get_ver_button_red@2x.png */, + A9EC95BF19B5501B00681678 /* icon_phone@2x.png */, + A9EC95BD19B54FEC00681678 /* textField_bg@2x.png */, + A9EC95B919B54FDB00681678 /* textField_cancel_ios7_s.png */, + A9EC95BA19B54FDB00681678 /* textField_cancel_ios7.png */, A9B2507619B4C8B2003E8855 /* red_select_arrow@2x.png */, A919056919B07AAF002575DF /* pie_chart_arrow@2x.png */, A919056619B067B8002575DF /* adview@2x.png */, @@ -751,6 +804,7 @@ A9AF6C971994C97F0076C0EE /* MainView */ = { isa = PBXGroup; children = ( + A9EC95B319B54F5700681678 /* LoginView */, A90BEBFD199DDA9300230242 /* ProductView */, A94FE51B199C9BE300626DE5 /* MoveView */, A9C69443199BBE9500B2CECE /* MyView */, @@ -796,6 +850,19 @@ path = MRCircularProgressView; sourceTree = ""; }; + A9EC95B319B54F5700681678 /* LoginView */ = { + isa = PBXGroup; + children = ( + A9EC95B419B54F6E00681678 /* LoginViewController.h */, + A9EC95B519B54F6E00681678 /* LoginViewController.m */, + A9EC95B619B54F6E00681678 /* LoginViewController.xib */, + A97F9D2019B595550073E7E6 /* InputPassWordViewController.h */, + A97F9D2119B595550073E7E6 /* InputPassWordViewController.m */, + A97F9D2219B595550073E7E6 /* InputPassWordViewController.xib */, + ); + path = LoginView; + sourceTree = ""; + }; A9F1E18319ACB24500B6A441 /* CustomCell */ = { isa = PBXGroup; children = ( @@ -894,11 +961,15 @@ A9C69448199BC1F500B2CECE /* gray_select_arrow@2x.png in Resources */, A986268B19B40AAC00FF9E2C /* SVWebViewController.bundle in Resources */, A9AF6C731994B5890076C0EE /* icon_bar_share@2x.png in Resources */, + A97F9D1519B592E90073E7E6 /* get_ver_button_gry@2x.png in Resources */, A9EAA04019985EDE001A872A /* HomeMainView.xib in Resources */, A988A902199A755300EB10AA /* FundListCell.xib in Resources */, A9AF6C6919949CD30076C0EE /* icon_dock_session@2x.png in Resources */, A9AF6C5C19949CD30076C0EE /* icon_dock_forum_actived@2x.png in Resources */, + A97F9D1E19B5931C0073E7E6 /* register_button_s@2x.png in Resources */, + A9EC95BE19B54FEC00681678 /* textField_bg@2x.png in Resources */, A9F1E18819ACB64D00B6A441 /* DTCoreTextTableViewCell.xib in Resources */, + A97F9D1F19B5931C0073E7E6 /* register_button@2x.png in Resources */, A9C69456199BD14D00B2CECE /* more_icon_8@2x.png in Resources */, A9AF6C48199498D10076C0EE /* MoreViewController.xib in Resources */, A9C69451199BD14D00B2CECE /* more_icon_2@2x.png in Resources */, @@ -908,12 +979,15 @@ A9EAA04819986DC3001A872A /* fund_cell_label_bg_red@2x.png in Resources */, A91C6D4219AB8E9C00AEBF4D /* p2c_safeicon@2x.png in Resources */, A9C6945A199BD16000B2CECE /* more_icon_1@2x.png in Resources */, + A9EC95B819B54F6E00681678 /* LoginViewController.xib in Resources */, A9EAA05F1998BB82001A872A /* about_dot@2x.png in Resources */, A9AF6C5E19949CD30076C0EE /* icon_dock_home_actived@2x.png in Resources */, A9EAA04519986DC3001A872A /* fund_cell_label_bg_blue@2x.png in Resources */, + A97F9D1719B592E90073E7E6 /* get_ver_button_red@2x.png in Resources */, A919056719B067B8002575DF /* adview@2x.png in Resources */, A9AF6C6219949CD30076C0EE /* icon_dock_rt_actived@2x.png in Resources */, A98626A019B4241400FF9E2C /* ActivityCenterTableViewCell.xib in Resources */, + A9EC95C019B5501B00681678 /* icon_phone@2x.png in Resources */, A9AF6C781994B5890076C0EE /* icon_share_default.png in Resources */, A9AF6C741994B5890076C0EE /* icon_indicate_add_module@2x.png in Resources */, A919055F19B02A72002575DF /* icon_color_bank@2x.png in Resources */, @@ -923,6 +997,7 @@ A9EAA0501998787B001A872A /* hk_home_center_cover@2x.png in Resources */, A9C0540619ADBCB2002331A5 /* FundProductInfoViewController.xib in Resources */, A9AF6C6719949CD30076C0EE /* icon_dock_session_actived@2x.png in Resources */, + A9EC95BB19B54FDB00681678 /* textField_cancel_ios7_s.png in Resources */, A9B2507719B4C8B2003E8855 /* red_select_arrow@2x.png in Resources */, A9AF6C771994B5890076C0EE /* icon_indicate_more@2x.png in Resources */, A90BEC02199DDA9E00230242 /* WYDProductViewController.xib in Resources */, @@ -934,6 +1009,7 @@ A919056C19B0882E002575DF /* AccountInfoViewController.xib in Resources */, A9B2507019B4C75E003E8855 /* HelpCenterViewController.xib in Resources */, A9AF6C8F1994C5700076C0EE /* MJRefresh.bundle in Resources */, + A97F9D1A19B592FD0073E7E6 /* login_button_s@2x.png in Resources */, A9E76DD619AB378A00C0D232 /* hk_home_icon2@2x.png in Resources */, A9AF6C6419949CD30076C0EE /* icon_dock_service_actived@2x.png in Resources */, A9E76DD719AB378A00C0D232 /* hk_home_icon3@2x.png in Resources */, @@ -946,6 +1022,7 @@ A9C69442199BB7B100B2CECE /* icon_person_take_image@2x.png in Resources */, A9C69457199BD14D00B2CECE /* more_icon_9@2x.png in Resources */, A90BEC07199DDAFB00230242 /* WYDInfoHeadView.xib in Resources */, + A97F9D1619B592E90073E7E6 /* get_ver_button_red_s@2x.png in Resources */, A9B2507519B4C796003E8855 /* HelpCenterTableViewCell.xib in Resources */, A919056119B02A83002575DF /* icon_color_name@2x.png in Resources */, A9AF6BF719947DD00076C0EE /* InfoPlist.strings in Resources */, @@ -960,6 +1037,7 @@ A9AF6C34199484200076C0EE /* HomeViewController.xib in Resources */, A9AF6C0019947DD00076C0EE /* Main.storyboard in Resources */, A986269119B411AA00FF9E2C /* DailyIncomeViewController.xib in Resources */, + A97F9D2419B595550073E7E6 /* InputPassWordViewController.xib in Resources */, A9AF6C3E199486CA0076C0EE /* ProductListViewController.xib in Resources */, A986269619B413D600FF9E2C /* DailyIncomeTableViewCell.xib in Resources */, A9AF6C2F199483520076C0EE /* MainViewController.xib in Resources */, @@ -967,6 +1045,8 @@ A9C69455199BD14D00B2CECE /* more_icon_7@2x.png in Resources */, A9EAA04F1998787B001A872A /* hk_home_center_bg@2x.png in Resources */, A9AF6C6319949CD30076C0EE /* icon_dock_rt@2x.png in Resources */, + A97F9D1B19B592FD0073E7E6 /* login_button@2x.png in Resources */, + A9EC95BC19B54FDB00681678 /* textField_cancel_ios7.png in Resources */, A9AF6C721994B5890076C0EE /* icon_bar_card@2x.png in Resources */, A9AF6C6819949CD30076C0EE /* icon_dock_session_msg@2x.png in Resources */, A9AF6C6619949CD30076C0EE /* icon_dock_session_actived_msg@2x.png in Resources */, @@ -1050,9 +1130,13 @@ A9C053FE19AD706C002331A5 /* ToolBarView.m in Sources */, A986269F19B4241400FF9E2C /* ActivityCenterTableViewCell.m in Sources */, A9AF6C951994C5700076C0EE /* UIScrollView+MJRefresh.m in Sources */, + A9EC95B719B54F6E00681678 /* LoginViewController.m in Sources */, A9AA326119970335000BE4FB /* ImagePlayerView.m in Sources */, A9AF6C0319947DD00076C0EE /* ViewController.m in Sources */, A90BEC01199DDA9E00230242 /* WYDProductViewController.m in Sources */, + A97F9D2319B595550073E7E6 /* InputPassWordViewController.m in Sources */, + A9EC95C319B55CF100681678 /* ManagerUser.m in Sources */, + A97F9D2719B5974B0073E7E6 /* UIUnderlinedButton.m in Sources */, A9AF6BFD19947DD00076C0EE /* AppDelegate.m in Sources */, A9AF6C911994C5700076C0EE /* MJRefreshConst.m in Sources */, A9AF6C931994C5700076C0EE /* MJRefreshHeaderView.m in Sources */, diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index b595fe2..b28cbc9 100644 Binary files a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate and b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ManagerDemo/AppDelegate.h b/ManagerDemo/AppDelegate.h index e91e9bb..4cb969c 100644 --- a/ManagerDemo/AppDelegate.h +++ b/ManagerDemo/AppDelegate.h @@ -7,9 +7,11 @@ // #import - -@interface AppDelegate : UIResponder - +#import "MainViewController.h" +@interface AppDelegate : UIResponder +{ + MainViewController* _mainViewController; +} @property (strong, nonatomic) UIWindow *window; - +@property (strong, nonatomic) MainViewController* mainViewController; @end diff --git a/ManagerDemo/AppDelegate.m b/ManagerDemo/AppDelegate.m index 6a580d3..e9bc641 100644 --- a/ManagerDemo/AppDelegate.m +++ b/ManagerDemo/AppDelegate.m @@ -8,14 +8,15 @@ #import "AppDelegate.h" #import "MainViewController.h" - +#import "MyViewController.h" @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. - MainViewController* mainViewController = [[MainViewController alloc] init]; - self.window.rootViewController = mainViewController; + _mainViewController = [[MainViewController alloc] init]; + self.window.rootViewController = _mainViewController; + _mainViewController.delegate = self; return YES; } @@ -46,4 +47,18 @@ // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } + +#pragma mark - UITabBarController +- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController +{ + if ([viewController isEqual:_mainViewController.myNavigationController]) { + if (![ManagerUser shareInstance].isLogin) { + [ManagerUtil presentLoginView]; + return NO; + }else{ + return YES; + } + } + return YES; +} @end diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h index 1e47254..8ab466c 100644 --- a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h @@ -34,4 +34,15 @@ typedef void (^FailedBlock) (NSError *error); * @return MKNetworkOperation */ -(MKNetworkOperation*)getFundRecommendWithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock; + +/** + * 快速登录 + * + * @param completionBlock 请求完成 + * @param failedBlock 请求失败 + * @param phoneNum 手机号码 + * @param password 登录密码 + * @return MKNetworkOperation + */ +-(MKNetworkOperation*)loginWithPhone:(NSString*)phoneNum withPassWord:(NSString*)password withCompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock; @end diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m index 921e05f..8aa8954 100644 --- a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m @@ -25,11 +25,31 @@ -(MKNetworkOperation*)getWithPath:(NSString*)path params:(NSDictionary *)params { - return [self operationWithPath:path params:params httpMethod:@"GET" ssl:YES]; + NSMutableDictionary* dic = nil; + if (params) { + dic = [[NSMutableDictionary alloc] initWithDictionary:params]; + }else{ + dic = [[NSMutableDictionary alloc] init]; + } +// [dic setObject:@"1408971073.153750" forKey:@"_"]; +// [dic setObject:@"211d9ede2548c40e5d18e47358835b16" forKey:@"sign"]; +// [dic setObject:@"MD5" forKey:@"sign_t"]; +// [dic setObject:@"f241caa3534d751598871852a2f5205f4927fcf8" forKey:@"token"]; +// [dic setObject:@"2.5.0" forKey:@"ver"]; +// [dic setObject:@"IOS" forKey:@"vjson"]; + + + return [self operationWithPath:path params:dic httpMethod:@"GET" ssl:YES]; } -(MKNetworkOperation*)postWithPath:(NSString*)path params:(NSDictionary *)params { - return [self operationWithPath:path params:params httpMethod:@"POST" ssl:YES]; + NSMutableDictionary* dic = nil; + if (params) { + dic = [[NSMutableDictionary alloc] initWithDictionary:params]; + }else{ + dic = [[NSMutableDictionary alloc] init]; + } + return [self operationWithPath:path params:dic httpMethod:@"POST" ssl:YES]; } -(MKNetworkOperation*)getBannerInfoWithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock { @@ -64,4 +84,22 @@ return op; } +-(MKNetworkOperation*)loginWithPhone:(NSString *)phoneNum withPassWord:(NSString *)password withCompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock +{ + NSDictionary* dic = [NSDictionary dictionaryWithObjectsAndKeys:phoneNum, @"cell", password, @"loginPwd",nil]; + MKNetworkOperation* op = [self postWithPath:@"fastlogin.do" params:dic]; + + [op addCompletionHandler:^(MKNetworkOperation *completedOperation) { + completionBlock(completedOperation.responseJSON); + + } errorHandler:^(MKNetworkOperation *completedOperation, NSError *error) { + DLog(@"%@", error); + failedBlock(error); + }]; + + [self enqueueOperation:op forceReload:YES]; + + return op; + +} @end diff --git a/ManagerDemo/Common/ManagerUser.h b/ManagerDemo/Common/ManagerUser.h new file mode 100644 index 0000000..f93b660 --- /dev/null +++ b/ManagerDemo/Common/ManagerUser.h @@ -0,0 +1,17 @@ +// +// ManagerUser.h +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface ManagerUser : NSObject +{ + BOOL _isLogin; +} +@property(nonatomic, assign)BOOL isLogin; ++(ManagerUser*)shareInstance; +@end diff --git a/ManagerDemo/Common/ManagerUser.m b/ManagerDemo/Common/ManagerUser.m new file mode 100644 index 0000000..6aa500e --- /dev/null +++ b/ManagerDemo/Common/ManagerUser.m @@ -0,0 +1,22 @@ +// +// ManagerUser.m +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "ManagerUser.h" + +@implementation ManagerUser + ++(ManagerUser*)shareInstance +{ + static ManagerUser* shareInstance = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + shareInstance = [[super alloc] init]; + }); + return shareInstance; +} +@end diff --git a/ManagerDemo/Common/ManagerUtil.h b/ManagerDemo/Common/ManagerUtil.h index 639e3f4..38cec86 100644 --- a/ManagerDemo/Common/ManagerUtil.h +++ b/ManagerDemo/Common/ManagerUtil.h @@ -12,6 +12,12 @@ +/** + * 跳转到登录页面 + * + * @param type type description + */ ++(void)presentLoginView; //删除参数view所有的subview + (void)removeAllSubView:(UIView*) view; /** diff --git a/ManagerDemo/Common/ManagerUtil.m b/ManagerDemo/Common/ManagerUtil.m index 6e5a6e8..9a2b3cf 100644 --- a/ManagerDemo/Common/ManagerUtil.m +++ b/ManagerDemo/Common/ManagerUtil.m @@ -7,10 +7,23 @@ // #import "ManagerUtil.h" - +#import "LoginViewController.h" +#import "AppDelegate.h" @implementation ManagerUtil ++(void)presentLoginView +{ + LoginViewController *login = [[LoginViewController alloc] init]; + UINavigationController *nav =[[UINavigationController alloc]initWithRootViewController:login]; + + AppDelegate *app = (AppDelegate *)[[UIApplication sharedApplication]delegate]; + [app.mainViewController presentViewController:nav animated:YES completion:^{ + + }]; + +} + +(void)SetSubViewExternNone:(UIViewController *)viewController { #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 diff --git a/ManagerDemo/Common/UIButtonUtil/UIUnderlinedButton.h b/ManagerDemo/Common/UIButtonUtil/UIUnderlinedButton.h new file mode 100644 index 0000000..6b8b32d --- /dev/null +++ b/ManagerDemo/Common/UIButtonUtil/UIUnderlinedButton.h @@ -0,0 +1,13 @@ +// +// UIUnderlinedButton.h +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface UIUnderlinedButton : UIButton + +@end diff --git a/ManagerDemo/Common/UIButtonUtil/UIUnderlinedButton.m b/ManagerDemo/Common/UIButtonUtil/UIUnderlinedButton.m new file mode 100644 index 0000000..9673a5e --- /dev/null +++ b/ManagerDemo/Common/UIButtonUtil/UIUnderlinedButton.m @@ -0,0 +1,41 @@ +// +// UIUnderlinedButton.m +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "UIUnderlinedButton.h" + +@implementation UIUnderlinedButton + +- (id)initWithFrame:(CGRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code + } + return self; +} + +- ( void ) drawRect:(CGRect)rect { + CGRect textRect = self.titleLabel.frame; + + // need to put the line at top of descenders (negative value) + CGFloat descender = self.titleLabel.font.descender; + + CGContextRef contextRef = UIGraphicsGetCurrentContext(); + + // set to same colour as text + CGContextSetStrokeColorWithColor(contextRef, self.titleLabel.textColor.CGColor); + + CGContextMoveToPoint(contextRef, textRect.origin.x, textRect.origin.y + textRect.size.height + descender); + + CGContextAddLineToPoint(contextRef, textRect.origin.x + textRect.size.width, textRect.origin.y + textRect.size.height + descender); + + CGContextClosePath(contextRef); + CGContextDrawPath(contextRef, kCGPathStroke); +} + +@end diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.h b/ManagerDemo/MainView/LoginView/InputPassWordViewController.h new file mode 100644 index 0000000..12362df --- /dev/null +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.h @@ -0,0 +1,29 @@ +// +// InputPassWordViewController.h +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import +#import "UIUnderlinedButton.h" + +@protocol InputPassWordViewControllerDelegate +-(void)loginSuccess; +@end +@interface InputPassWordViewController : UIViewController +{ + NSString* _phoneNum; + __weak id _delegate; + +} +@property (weak, nonatomic)id delegate; +@property (strong, nonatomic)NSString* phoneNum; +@property (weak, nonatomic) IBOutlet UITextField *passwordTextField; + +@property (weak, nonatomic) IBOutlet UIButton *sureBtn; +@property (weak, nonatomic) IBOutlet UIUnderlinedButton *forgetBtn; +- (IBAction)login:(id)sender; + +@end diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.m b/ManagerDemo/MainView/LoginView/InputPassWordViewController.m new file mode 100644 index 0000000..3a85dde --- /dev/null +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.m @@ -0,0 +1,76 @@ +// +// InputPassWordViewController.m +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "InputPassWordViewController.h" + +@interface InputPassWordViewController () + +@end + +@implementation InputPassWordViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + + self.navigationItem.title = @"填写登录密码"; + _passwordTextField.layer.masksToBounds=YES; + _passwordTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _passwordTextField.layer.borderWidth= 1.0f; + _passwordTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_passwordTextField]; + + _sureBtn.enabled = NO; + [_sureBtn setBackgroundImage:[ManagerUtil buttonImageFromColor:[UIColor lightGrayColor] withFrame:_sureBtn.frame] forState:UIControlStateDisabled]; + +} +-(void)textFieldTextDidChange:(NSNotification *)sender +{ + UITextField* textField = [sender object]; + if (textField.text.length>0) { + _sureBtn.enabled = YES; + }else{ + _sureBtn.enabled = NO; + } +} +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (IBAction)login:(id)sender { + if (_passwordTextField.text.length>0 && _phoneNum.length>0) { + DaiDaiTongApi* daiDaiTongApi = [DaiDaiTongApi shareInstance]; + [daiDaiTongApi loginWithPhone:_phoneNum withPassWord:_passwordTextField.text withCompletionBlock:^(id jsonRes) { + if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) { + [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:0.5]; + }else{ + } + [self.navigationController popToRootViewControllerAnimated:NO]; + if ([self.delegate respondsToSelector:@selector(loginSuccess)]) { + [self.delegate loginSuccess]; + } + + } failedBlock:^(NSError *error) { + DLog(@"失败"); + [MBProgressHUD errorHudWithView:nil label:@"网络出错" hidesAfter:1.0]; + }]; + } +} +@end diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib b/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib new file mode 100644 index 0000000..8ba5c24 --- /dev/null +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainView/LoginView/LoginViewController.h b/ManagerDemo/MainView/LoginView/LoginViewController.h new file mode 100644 index 0000000..68a834b --- /dev/null +++ b/ManagerDemo/MainView/LoginView/LoginViewController.h @@ -0,0 +1,18 @@ +// +// LoginViewController.h +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import +#import "InputPassWordViewController.h" +@interface LoginViewController : UIViewController +@property (weak, nonatomic) IBOutlet UITextField *phoneTextField; +@property (weak, nonatomic) IBOutlet UILabel *phoneLabel; +@property (weak, nonatomic) IBOutlet UIView *infoView; +@property (weak, nonatomic) IBOutlet UIButton *sureBtn; +- (IBAction)sureBtnClick:(id)sender; + +@end diff --git a/ManagerDemo/MainView/LoginView/LoginViewController.m b/ManagerDemo/MainView/LoginView/LoginViewController.m new file mode 100644 index 0000000..f5dc1f0 --- /dev/null +++ b/ManagerDemo/MainView/LoginView/LoginViewController.m @@ -0,0 +1,163 @@ +// +// LoginViewController.m +// ManagerDemo +// +// Created by xmfish on 14-9-2. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "LoginViewController.h" +#import "InputPassWordViewController.h" +@interface LoginViewController () + +@end + +@implementation LoginViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + self.navigationItem.title = @"填写手机号码"; + + //定制输入框 + UIView* leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; + leftView.backgroundColor = [UIColor clearColor]; + UIImageView* phoneImgView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_phone"]]; + phoneImgView.center = leftView.center; + [leftView addSubview:phoneImgView]; + _phoneTextField.leftView = leftView; + _phoneTextField.leftViewMode = UITextFieldViewModeAlways; + _phoneTextField.layer.masksToBounds=YES; + _phoneTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _phoneTextField.layer.borderWidth= 1.0f; + _phoneTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_phoneTextField]; + _phoneTextField.delegate = self; + + _sureBtn.enabled = NO; + [_sureBtn setBackgroundImage:[ManagerUtil buttonImageFromColor:[UIColor lightGrayColor] withFrame:_sureBtn.frame] forState:UIControlStateDisabled]; + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"取消" style:UIBarButtonItemStyleBordered target:self action:@selector(popViewController)]; + + +} + +-(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event +{ + + [_phoneTextField resignFirstResponder]; + if (_phoneLabel.hidden == NO) { + _phoneLabel.hidden = YES; + CGRect frame = _infoView.frame; + frame.origin.y -= 40; + [UIView animateWithDuration:0.5 delay:0 options:0 animations:^(){ + _infoView.frame = frame; + } completion:^(BOOL finished) + { + + }]; + } +} +#pragma mark UITextFieldDelegate +-(BOOL)textFieldShouldBeginEditing:(UITextField *)textField +{ + _phoneTextField.layer.borderColor = [[UIColor orangeColor]CGColor]; + return YES; +} +- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string +{ + + if (range.location >= 11) + return NO; // return NO to not change text + + return YES; +} +-(void)textFieldTextDidChange:(NSNotification *)sender +{ + + UITextField* textField = [sender object]; + if ([textField.text isEqualToString:@""]) { + if (_phoneLabel.hidden == NO) { + CGRect frame = _infoView.frame; + frame.origin.y -= 40; + [UIView animateWithDuration:0.5 delay:0 options:0 animations:^(){ + _infoView.frame = frame; + } completion:^(BOOL finished) + { + + }]; + _phoneLabel.hidden = YES; + _sureBtn.enabled = NO; + } + + }else{ + if (_phoneLabel.hidden == YES) { + CGRect frame = _infoView.frame; + frame.origin.y += 40; + [UIView animateWithDuration:0.5 delay:0 options:0 animations:^(){ + _infoView.frame = frame; + } completion:^(BOOL finished) + { + + }]; + _phoneLabel.hidden = NO; + _sureBtn.enabled = YES; + } + + + + } + + NSMutableString* tempStr = [[NSMutableString alloc] initWithString:textField.text]; + if (tempStr.length > 7) { + [tempStr insertString:@" " atIndex:7]; + } + if (tempStr.length > 3) { + [tempStr insertString:@" " atIndex:3]; + } + + _phoneLabel.text = tempStr; +} +-(BOOL)textFieldShouldEndEditing:(UITextField *)textField +{ + + return YES; +} +-(void)popViewController +{ + [self.navigationController dismissViewControllerAnimated:YES completion:nil]; +} + + +- (IBAction)sureBtnClick:(id)sender { + InputPassWordViewController* inputPassWordViewController = [[InputPassWordViewController alloc] init]; + inputPassWordViewController.hidesBottomBarWhenPushed = YES; + inputPassWordViewController.delegate = self; + inputPassWordViewController.phoneNum = _phoneTextField.text; + [self.navigationController pushViewController:inputPassWordViewController animated:YES]; +} + +#pragma mark InputPassWordViewControllerDelegate +-(void)loginSuccess +{ + [self.navigationController dismissViewControllerAnimated:YES completion:nil]; +} +-(void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} +@end diff --git a/ManagerDemo/MainView/LoginView/LoginViewController.xib b/ManagerDemo/MainView/LoginView/LoginViewController.xib new file mode 100644 index 0000000..c21c985 --- /dev/null +++ b/ManagerDemo/MainView/LoginView/LoginViewController.xib @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainViewControll/HomeViewController.m b/ManagerDemo/MainViewControll/HomeViewController.m index 6f2fa43..7e73a7d 100644 --- a/ManagerDemo/MainViewControll/HomeViewController.m +++ b/ManagerDemo/MainViewControll/HomeViewController.m @@ -67,7 +67,7 @@ }]; [daiDaiTongApi getFundRecommendWithcompletionBlock:^(id jsonRes) { if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) { -// [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:0.5]; }else{ } [self.tableView reloadData]; diff --git a/ManagerDemo/MainViewControll/MainViewController.h b/ManagerDemo/MainViewControll/MainViewController.h index 72d51ab..5f2613e 100644 --- a/ManagerDemo/MainViewControll/MainViewController.h +++ b/ManagerDemo/MainViewControll/MainViewController.h @@ -8,5 +8,14 @@ #import @interface MainViewController : UITabBarController - +{ + UINavigationController* _homeNavigationController; + UINavigationController* _produciListNavigationController; + UINavigationController* _myNavigationController; + UINavigationController* _moreNavigationController; +} +@property(nonatomic, strong)UINavigationController* homeNavigationController; +@property(nonatomic, strong)UINavigationController* produciListNavigationController; +@property(nonatomic, strong)UINavigationController* myNavigationController; +@property(nonatomic, strong)UINavigationController* moreNavigationController; @end diff --git a/ManagerDemo/MainViewControll/MainViewController.m b/ManagerDemo/MainViewControll/MainViewController.m index c286c47..3395d47 100644 --- a/ManagerDemo/MainViewControll/MainViewController.m +++ b/ManagerDemo/MainViewControll/MainViewController.m @@ -11,6 +11,7 @@ #import "ProductListViewController.h" #import "MyViewController.h" #import "MoreViewController.h" +#import "LoginViewController.h" @interface MainViewController () @end @@ -24,26 +25,26 @@ // Custom initialization //首页 - UINavigationController* homeNavigationController = [[UINavigationController alloc] initWithRootViewController:[[HomeViewController alloc] init]]; + _homeNavigationController = [[UINavigationController alloc] initWithRootViewController:[[HomeViewController alloc] init]]; //第二页 - UINavigationController* produciListNavigationController = [[UINavigationController alloc] initWithRootViewController:[[ProductListViewController alloc] init]]; + _produciListNavigationController = [[UINavigationController alloc] initWithRootViewController:[[ProductListViewController alloc] init]]; //第三页 - UINavigationController* myNavigationController = [[UINavigationController alloc] initWithRootViewController:[[MyViewController alloc] init]]; + _myNavigationController = [[UINavigationController alloc] initWithRootViewController:[[MyViewController alloc] init]]; //第四页 - UINavigationController* moreNavigationController = [[UINavigationController alloc] initWithRootViewController:[[MoreViewController alloc] init]]; + _moreNavigationController = [[UINavigationController alloc] initWithRootViewController:[[MoreViewController alloc] init]]; if (IOS7_OR_LATER) { - [homeNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"首页" image:[UIImage imageNamed:@"icon_dock_home"] selectedImage:[UIImage imageNamed:@"icon_dock_home_actived"]]]; - [homeNavigationController.tabBarItem setBadgeValue:@"新"]; + [_homeNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"首页" image:[UIImage imageNamed:@"icon_dock_home"] selectedImage:[UIImage imageNamed:@"icon_dock_home_actived"]]]; + [_homeNavigationController.tabBarItem setBadgeValue:@"新"]; - [produciListNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"第二页" image:[UIImage imageNamed:@"icon_dock_session"] selectedImage:[UIImage imageNamed:@"icon_dock_session_actived"]]]; + [_produciListNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"第二页" image:[UIImage imageNamed:@"icon_dock_session"] selectedImage:[UIImage imageNamed:@"icon_dock_session_actived"]]]; - [myNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"第三页" image:[UIImage imageNamed:@"icon_dock_mine"] selectedImage:[UIImage imageNamed:@"icon_dock_mine_actived"]]]; + [_myNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"第三页" image:[UIImage imageNamed:@"icon_dock_mine"] selectedImage:[UIImage imageNamed:@"icon_dock_mine_actived"]]]; - [moreNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"第四页" image:[UIImage imageNamed:@"icon_dock_service"] selectedImage:[UIImage imageNamed:@"icon_dock_service_actived"]]]; + [_moreNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"第四页" image:[UIImage imageNamed:@"icon_dock_service"] selectedImage:[UIImage imageNamed:@"icon_dock_service_actived"]]]; } - self.viewControllers = @[homeNavigationController, produciListNavigationController, myNavigationController, moreNavigationController]; + self.viewControllers = @[_homeNavigationController, _produciListNavigationController, _myNavigationController, _moreNavigationController]; } @@ -55,8 +56,10 @@ [super viewDidLoad]; // Do any additional setup after loading the view from its nib. + [ManagerUser shareInstance].isLogin = NO; } + - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; diff --git a/ManagerDemo/ManagerDemo-Prefix.pch b/ManagerDemo/ManagerDemo-Prefix.pch index 02ca315..5d3a3f0 100644 --- a/ManagerDemo/ManagerDemo-Prefix.pch +++ b/ManagerDemo/ManagerDemo-Prefix.pch @@ -23,4 +23,5 @@ #import "DaiDaiTongApi.h" #import #import + #import "ManagerUser.h" #endif diff --git a/ManagerDemo/Resource/get_ver_button_gry@2x.png b/ManagerDemo/Resource/get_ver_button_gry@2x.png new file mode 100644 index 0000000..73da6c1 Binary files /dev/null and b/ManagerDemo/Resource/get_ver_button_gry@2x.png differ diff --git a/ManagerDemo/Resource/get_ver_button_red@2x.png b/ManagerDemo/Resource/get_ver_button_red@2x.png new file mode 100644 index 0000000..31afd8f Binary files /dev/null and b/ManagerDemo/Resource/get_ver_button_red@2x.png differ diff --git a/ManagerDemo/Resource/get_ver_button_red_s@2x.png b/ManagerDemo/Resource/get_ver_button_red_s@2x.png new file mode 100644 index 0000000..54b3ae1 Binary files /dev/null and b/ManagerDemo/Resource/get_ver_button_red_s@2x.png differ diff --git a/ManagerDemo/Resource/icon_phone@2x.png b/ManagerDemo/Resource/icon_phone@2x.png new file mode 100644 index 0000000..521d1eb Binary files /dev/null and b/ManagerDemo/Resource/icon_phone@2x.png differ diff --git a/ManagerDemo/Resource/login_button@2x.png b/ManagerDemo/Resource/login_button@2x.png new file mode 100644 index 0000000..3ef5af5 Binary files /dev/null and b/ManagerDemo/Resource/login_button@2x.png differ diff --git a/ManagerDemo/Resource/login_button_s@2x.png b/ManagerDemo/Resource/login_button_s@2x.png new file mode 100644 index 0000000..946b830 Binary files /dev/null and b/ManagerDemo/Resource/login_button_s@2x.png differ diff --git a/ManagerDemo/Resource/register_button@2x.png b/ManagerDemo/Resource/register_button@2x.png new file mode 100644 index 0000000..8f14cfb Binary files /dev/null and b/ManagerDemo/Resource/register_button@2x.png differ diff --git a/ManagerDemo/Resource/register_button_s@2x.png b/ManagerDemo/Resource/register_button_s@2x.png new file mode 100644 index 0000000..fcba2d5 Binary files /dev/null and b/ManagerDemo/Resource/register_button_s@2x.png differ diff --git a/ManagerDemo/Resource/textField_bg@2x.png b/ManagerDemo/Resource/textField_bg@2x.png new file mode 100644 index 0000000..7a0248e Binary files /dev/null and b/ManagerDemo/Resource/textField_bg@2x.png differ diff --git a/ManagerDemo/Resource/textField_cancel_ios7.png b/ManagerDemo/Resource/textField_cancel_ios7.png new file mode 100644 index 0000000..5bbcf0a Binary files /dev/null and b/ManagerDemo/Resource/textField_cancel_ios7.png differ diff --git a/ManagerDemo/Resource/textField_cancel_ios7_s.png b/ManagerDemo/Resource/textField_cancel_ios7_s.png new file mode 100644 index 0000000..4db0c2b Binary files /dev/null and b/ManagerDemo/Resource/textField_cancel_ios7_s.png differ