diff --git a/MoblieCQUPT_iOS.xcodeproj/project.pbxproj b/MoblieCQUPT_iOS.xcodeproj/project.pbxproj index b059ea6..e8517dd 100755 --- a/MoblieCQUPT_iOS.xcodeproj/project.pbxproj +++ b/MoblieCQUPT_iOS.xcodeproj/project.pbxproj @@ -51,6 +51,17 @@ 6E1D6CB91F3966EF005ED0F3 /* 重邮风采@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E1D6C921F3966EF005ED0F3 /* 重邮风采@3x.png */; }; 6E1D6CBA1F3966EF005ED0F3 /* 黄色@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E1D6C931F3966EF005ED0F3 /* 黄色@2x.png */; }; 6E1D6CBB1F3966EF005ED0F3 /* 黄色@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E1D6C941F3966EF005ED0F3 /* 黄色@3x.png */; }; + 820FAC311F39A8FD008675C1 /* CampusEnvironmentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 820FAC2F1F39A8FD008675C1 /* CampusEnvironmentCell.m */; }; + 8277AA801F3AED940010048B /* 3.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA791F3AED940010048B /* 3.png */; }; + 8277AA811F3AED940010048B /* 4.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA7A1F3AED940010048B /* 4.png */; }; + 8277AA821F3AED940010048B /* 0.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA7B1F3AED940010048B /* 0.png */; }; + 8277AA831F3AED940010048B /* 2.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA7C1F3AED940010048B /* 2.png */; }; + 8277AA841F3AED940010048B /* 1.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA7D1F3AED940010048B /* 1.png */; }; + 8277AA851F3AED940010048B /* 6.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA7E1F3AED940010048B /* 6.png */; }; + 8277AA861F3AED940010048B /* 5.png in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA7F1F3AED940010048B /* 5.png */; }; + 8277AA891F3AEFAA0010048B /* 1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 8277AA881F3AEFAA0010048B /* 1.jpg */; }; + 82C61D0A1F3C523600066F23 /* MyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 82C61D081F3C523600066F23 /* MyTableViewCell.m */; }; + 82C61D0B1F3C523600066F23 /* MyTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82C61D091F3C523600066F23 /* MyTableViewCell.xib */; }; CE41EE121C1FE1A2004C873A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE41EE111C1FE1A2004C873A /* ViewController.m */; }; CE4334471BE7C52D000C407D /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4334461BE7C52D000C407D /* NotificationCenter.framework */; }; CE43344D1BE7C52D000C407D /* TodayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE43344C1BE7C52D000C407D /* TodayViewController.m */; }; @@ -539,8 +550,8 @@ 6E1D6C691F3966EF005ED0F3 /* StatisticsTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatisticsTable.m; sourceTree = ""; }; 6E1D6C6A1F3966EF005ED0F3 /* HomePageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomePageViewController.h; sourceTree = ""; }; 6E1D6C6B1F3966EF005ED0F3 /* HomePageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomePageViewController.m; sourceTree = ""; }; - 6E1D6C6C1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaleToFemaleRatioViewController.h; sourceTree = ""; }; - 6E1D6C6D1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MaleToFemaleRatioViewController.m; sourceTree = ""; }; + 6E1D6C6C1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaleToFemaleRatioViewController.h; path = ../MaleToFemaleRatioViewController.h; sourceTree = ""; }; + 6E1D6C6D1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MaleToFemaleRatioViewController.m; path = ../MaleToFemaleRatioViewController.m; sourceTree = ""; }; 6E1D6C6E1F3966EF005ED0F3 /* SegmentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentView.h; sourceTree = ""; }; 6E1D6C6F1F3966EF005ED0F3 /* SegmentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SegmentView.m; sourceTree = ""; }; 6E1D6C711F3966EF005ED0F3 /* BeautyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeautyViewController.m; sourceTree = ""; }; @@ -579,6 +590,19 @@ 6E1D6C931F3966EF005ED0F3 /* 黄色@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "黄色@2x.png"; sourceTree = ""; }; 6E1D6C941F3966EF005ED0F3 /* 黄色@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "黄色@3x.png"; sourceTree = ""; }; 6E1D6CBC1F3967A2005ED0F3 /* BeautyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BeautyViewController.h; sourceTree = ""; }; + 820FAC2E1F39A8FD008675C1 /* CampusEnvironmentCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CampusEnvironmentCell.h; sourceTree = ""; }; + 820FAC2F1F39A8FD008675C1 /* CampusEnvironmentCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CampusEnvironmentCell.m; sourceTree = ""; }; + 8277AA791F3AED940010048B /* 3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 3.png; sourceTree = ""; }; + 8277AA7A1F3AED940010048B /* 4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 4.png; sourceTree = ""; }; + 8277AA7B1F3AED940010048B /* 0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 0.png; sourceTree = ""; }; + 8277AA7C1F3AED940010048B /* 2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 2.png; sourceTree = ""; }; + 8277AA7D1F3AED940010048B /* 1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 1.png; sourceTree = ""; }; + 8277AA7E1F3AED940010048B /* 6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 6.png; sourceTree = ""; }; + 8277AA7F1F3AED940010048B /* 5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 5.png; sourceTree = ""; }; + 8277AA881F3AEFAA0010048B /* 1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1.jpg; sourceTree = ""; }; + 82C61D071F3C523600066F23 /* MyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTableViewCell.h; sourceTree = ""; }; + 82C61D081F3C523600066F23 /* MyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTableViewCell.m; sourceTree = ""; }; + 82C61D091F3C523600066F23 /* MyTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyTableViewCell.xib; sourceTree = ""; }; BA10D639E65F33ACE628A0EB /* Pods-MoblieCQUPT_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoblieCQUPT_iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-MoblieCQUPT_iOS/Pods-MoblieCQUPT_iOS.release.xcconfig"; sourceTree = ""; }; CE25501F1C15BD9500BCDDB8 /* ClassWidget.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = ClassWidget.entitlements; sourceTree = ""; }; CE41EE101C1FE1A2004C873A /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; @@ -1235,8 +1259,6 @@ 6E1D6C611F3966EF005ED0F3 /* CQUPTData */, 6E1D6C6A1F3966EF005ED0F3 /* HomePageViewController.h */, 6E1D6C6B1F3966EF005ED0F3 /* HomePageViewController.m */, - 6E1D6C6C1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.h */, - 6E1D6C6D1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.m */, 6E1D6C6E1F3966EF005ED0F3 /* SegmentView.h */, 6E1D6C6F1F3966EF005ED0F3 /* SegmentView.m */, 6E1D6C701F3966EF005ED0F3 /* StuStrategyDetailVC */, @@ -1268,6 +1290,8 @@ children = ( 6E1D6C621F3966EF005ED0F3 /* CQUPTDataRootViewController.h */, 6E1D6C631F3966EF005ED0F3 /* CQUPTDataRootViewController.m */, + 6E1D6C6C1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.h */, + 6E1D6C6D1F3966EF005ED0F3 /* MaleToFemaleRatioViewController.m */, 6E1D6C641F3966EF005ED0F3 /* EmploymentRateViewController.h */, 6E1D6C651F3966EF005ED0F3 /* EmploymentRateViewController.m */, 6E1D6C661F3966EF005ED0F3 /* MostDifficultSubjectsViewController.h */, @@ -1281,12 +1305,17 @@ 6E1D6C701F3966EF005ED0F3 /* StuStrategyDetailVC */ = { isa = PBXGroup; children = ( - 6E1D6CBC1F3967A2005ED0F3 /* BeautyViewController.h */, - 6E1D6C711F3966EF005ED0F3 /* BeautyViewController.m */, 6E1D6C721F3966EF005ED0F3 /* CampusEnvironmentViewController.h */, 6E1D6C731F3966EF005ED0F3 /* CampusEnvironmentViewController.m */, + 820FAC2E1F39A8FD008675C1 /* CampusEnvironmentCell.h */, + 820FAC2F1F39A8FD008675C1 /* CampusEnvironmentCell.m */, + 8277AA871F3AED9C0010048B /* 校园环境图标 */, + 6E1D6C7E1F3966EF005ED0F3 /* StuBedroomViewController.h */, + 6E1D6C7F1F3966EF005ED0F3 /* StuBedroomViewController.m */, 6E1D6C741F3966EF005ED0F3 /* CanteenViewController.h */, 6E1D6C751F3966EF005ED0F3 /* CanteenViewController.m */, + 6E1D6CBC1F3967A2005ED0F3 /* BeautyViewController.h */, + 6E1D6C711F3966EF005ED0F3 /* BeautyViewController.m */, 6E1D6C761F3966EF005ED0F3 /* DailyLifeViewController.h */, 6E1D6C771F3966EF005ED0F3 /* DailyLifeViewController.m */, 6E1D6C781F3966EF005ED0F3 /* FoodViewController.h */, @@ -1295,10 +1324,11 @@ 6E1D6C7B1F3966EF005ED0F3 /* IntroductionViewController.m */, 6E1D6C7C1F3966EF005ED0F3 /* QQGroupViewController.h */, 6E1D6C7D1F3966EF005ED0F3 /* QQGroupViewController.m */, - 6E1D6C7E1F3966EF005ED0F3 /* StuBedroomViewController.h */, - 6E1D6C7F1F3966EF005ED0F3 /* StuBedroomViewController.m */, 6E1D6C801F3966EF005ED0F3 /* StuStrategyRootViewController.h */, 6E1D6C811F3966EF005ED0F3 /* StuStrategyRootViewController.m */, + 82C61D071F3C523600066F23 /* MyTableViewCell.h */, + 82C61D081F3C523600066F23 /* MyTableViewCell.m */, + 82C61D091F3C523600066F23 /* MyTableViewCell.xib */, ); path = StuStrategyDetailVC; sourceTree = ""; @@ -1328,6 +1358,21 @@ path = "图标"; sourceTree = ""; }; + 8277AA871F3AED9C0010048B /* 校园环境图标 */ = { + isa = PBXGroup; + children = ( + 8277AA881F3AEFAA0010048B /* 1.jpg */, + 8277AA791F3AED940010048B /* 3.png */, + 8277AA7A1F3AED940010048B /* 4.png */, + 8277AA7B1F3AED940010048B /* 0.png */, + 8277AA7C1F3AED940010048B /* 2.png */, + 8277AA7D1F3AED940010048B /* 1.png */, + 8277AA7E1F3AED940010048B /* 6.png */, + 8277AA7F1F3AED940010048B /* 5.png */, + ); + name = "校园环境图标"; + sourceTree = ""; + }; C66265BA2143171179039C97 /* Pods */ = { isa = PBXGroup; children = ( @@ -1423,6 +1468,7 @@ F242DA551EBCB2BB005AC411 /* MoblieCQUPT_iOS */ = { isa = PBXGroup; children = ( + F242DAFE1EBCB2BB005AC411 /* shake(give up) */, F242DA5C1EBCB2BB005AC411 /* Course */, F242DA6B1EBCB2BB005AC411 /* Finder */, F242DB8C1EBCB2BB005AC411 /* Login */, @@ -1485,13 +1531,12 @@ F242DA6B1EBCB2BB005AC411 /* Finder */ = { isa = PBXGroup; children = ( + F242DAC71EBCB2BB005AC411 /* RedrockWebsite */, F242DF831EBD9E2C005AC411 /* LostAndFound */, F242DA6C1EBCB2BB005AC411 /* Community */, F242DA941EBCB2BB005AC411 /* Map */, F242DA981EBCB2BB005AC411 /* Query */, - F242DAC71EBCB2BB005AC411 /* RedrockWebsite */, F242DACB1EBCB2BB005AC411 /* Resource */, - F242DAFE1EBCB2BB005AC411 /* shake(give up) */, F242DB021EBCB2BB005AC411 /* Shop */, 6E1D6C551F3966EF005ED0F3 /* FreshMan_2017 */, F242DA701EBCB2BB005AC411 /* FinderViewController.h */, @@ -1670,7 +1715,7 @@ F242DB011EBCB2BB005AC411 /* ShakeViewController.xib */, ); name = "shake(give up)"; - path = shake; + path = Finder/shake; sourceTree = ""; }; F242DB021EBCB2BB005AC411 /* Shop */ = { @@ -2707,6 +2752,7 @@ buildActionMask = 2147483647; files = ( F22286B21EED39840017516C /* icon_share_weibo@3x.png in Resources */, + 8277AA841F3AED940010048B /* 1.png in Resources */, F242DEF41EBCB2BC005AC411 /* 图片7.jpg in Resources */, F242DEF01EBCB2BC005AC411 /* 图片3.jpg in Resources */, F242DF341EBCB2BC005AC411 /* emptyClassTag2.png in Resources */, @@ -2715,12 +2761,14 @@ F242DFAF1EBD9E2C005AC411 /* LZIssueSucceedViewController.xib in Resources */, F242DE9B1EBCB2BC005AC411 /* 无课@3x.png in Resources */, F242DDC81EBCB2BB005AC411 /* cqupt3@2x.jpg in Resources */, + 8277AA851F3AED940010048B /* 6.png in Resources */, F242DDD81EBCB2BB005AC411 /* lost_image_lackplace@3x.png in Resources */, F242DE9E1EBCB2BC005AC411 /* 椭圆@2x.png in Resources */, F242DF3D1EBCB2BC005AC411 /* 期末成绩@2x.png in Resources */, F242DDE81EBCB2BB005AC411 /* lost_image_time@3x.png in Resources */, F242DE731EBCB2BC005AC411 /* remind0@2x.png in Resources */, F242DED81EBCB2BC005AC411 /* headImage.png in Resources */, + 8277AA821F3AED940010048B /* 0.png in Resources */, F242DDC91EBCB2BB005AC411 /* iconfont-shop1.png in Resources */, F242DF2D1EBCB2BC005AC411 /* iconfont-name.png in Resources */, F242DFA91EBD9E2C005AC411 /* DetailLostViewController.xib in Resources */, @@ -2781,6 +2829,7 @@ F242DE711EBCB2BC005AC411 /* add@2x.png in Resources */, F242DF3C1EBCB2BC005AC411 /* 我的动态@2x.png in Resources */, F242DDAC1EBCB2BB005AC411 /* doneImage.png in Resources */, + 8277AA801F3AED940010048B /* 3.png in Resources */, F242DE501EBCB2BC005AC411 /* Images.xcassets in Resources */, F242DDD11EBCB2BB005AC411 /* lost_image_infocategory@2x.png in Resources */, F242DF2B1EBCB2BC005AC411 /* iconfont_meizhou.png in Resources */, @@ -2794,6 +2843,7 @@ F242DE7D1EBCB2BC005AC411 /* 下拉@2x.png in Resources */, F242DE9A1EBCB2BC005AC411 /* 无课@2x.png in Resources */, F242DDEB1EBCB2BB005AC411 /* ok.png in Resources */, + 8277AA811F3AED940010048B /* 4.png in Resources */, 6E1D6CB41F3966EF005ED0F3 /* 邮子攻略@2x.png in Resources */, F22286B11EED39840017516C /* icon_share_weibo@2x.png in Resources */, F242DEAD1EBCB2BC005AC411 /* 返回箭头@3x.png in Resources */, @@ -2812,6 +2862,7 @@ F242DE8B1EBCB2BC005AC411 /* 多课0@3x.png in Resources */, F242DF1D1EBCB2BC005AC411 /* 40-2.png in Resources */, F242DF4B1EBCB2BC005AC411 /* iconfont-location.png in Resources */, + 8277AA831F3AED940010048B /* 2.png in Resources */, F242DD881EBCB2BB005AC411 /* LaunchScreen.xib in Resources */, F242DF251EBCB2BC005AC411 /* courseMengbi.jpg in Resources */, F242DE901EBCB2BC005AC411 /* 完成@2x.png in Resources */, @@ -2912,6 +2963,7 @@ F242DDD01EBCB2BB005AC411 /* lost_image_describe@3x.png in Resources */, F242DF431EBCB2BC005AC411 /* icon_menu_2@2x.png in Resources */, F242DDD91EBCB2BB005AC411 /* lost_image_lacktel@2x.png in Resources */, + 8277AA861F3AED940010048B /* 5.png in Resources */, F242DE871EBCB2BC005AC411 /* 周数@3x.png in Resources */, F242DF2A1EBCB2BC005AC411 /* iconfont-titleTag.png in Resources */, F242DDC21EBCB2BB005AC411 /* reinstallImage.png in Resources */, @@ -2930,6 +2982,7 @@ F242DE7F1EBCB2BC005AC411 /* 不提醒@2x.png in Resources */, F242DDDE1EBCB2BB005AC411 /* lost_image_many@3x.png in Resources */, F242DF521EBCB2BC005AC411 /* splash.jpg in Resources */, + 8277AA891F3AEFAA0010048B /* 1.jpg in Resources */, F22286AF1EED39840017516C /* icon_share_more@3x.png in Resources */, F242DF211EBCB2BC005AC411 /* 智妍1.jpg in Resources */, F242DF491EBCB2BC005AC411 /* icon_menu_selected_4@2x.png in Resources */, @@ -2961,6 +3014,7 @@ F242DDAA1EBCB2BB005AC411 /* angleImage.png in Resources */, F21A8FAA1ED9679F0093FBC4 /* arrowIcon.png in Resources */, F242DF3A1EBCB2BC005AC411 /* 反馈信息@2x.png in Resources */, + 82C61D0B1F3C523600066F23 /* MyTableViewCell.xib in Resources */, F21A8FAB1ED9679F0093FBC4 /* aNumIcon.png in Resources */, F242DDE11EBCB2BB005AC411 /* lost_image_QQ@2x.png in Resources */, F242DDA81EBCB2BB005AC411 /* MapViewController.xib in Resources */, @@ -3098,6 +3152,7 @@ F242DE6E1EBCB2BC005AC411 /* LessonHandle.m in Sources */, F242DF101EBCB2BC005AC411 /* MyMessagesViewController.m in Sources */, 6E1D6C9E1F3966EF005ED0F3 /* HomePageViewController.m in Sources */, + 820FAC311F39A8FD008675C1 /* CampusEnvironmentCell.m in Sources */, F242DEB61EBCB2BC005AC411 /* RemindNotification.m in Sources */, F2DA60C51ED033E40049E681 /* TopicModel.m in Sources */, F242DE6C1EBCB2BC005AC411 /* TimeChooseViewController.m in Sources */, @@ -3164,6 +3219,7 @@ F242DF061EBCB2BC005AC411 /* PickView.m in Sources */, F22286A31EED33510017516C /* ImageWithLabels.m in Sources */, F242DE551EBCB2BC005AC411 /* BaseMatter.m in Sources */, + 82C61D0A1F3C523600066F23 /* MyTableViewCell.m in Sources */, F242DE561EBCB2BC005AC411 /* BaseTableViewController.m in Sources */, F242DF0F1EBCB2BC005AC411 /* MyMessagesTableViewCell.m in Sources */, 6E1D6CA01F3966EF005ED0F3 /* SegmentView.m in Sources */, diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsCell.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsCell.h deleted file mode 100644 index 267bc44..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsCell.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// CQUPTStudentsCell.h -// MoblieCQUPT_iOS -// -// Created by xiaogou134 on 2017/8/7. -// Copyright © 2017年 Orange-W. All rights reserved. -// - -#import - -@interface CQUPTStudentsCell : UITableViewCell - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsCell.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsCell.m deleted file mode 100644 index 0b30460..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsCell.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// CQUPTStudentsCell.m -// MoblieCQUPT_iOS -// -// Created by xiaogou134 on 2017/8/7. -// Copyright © 2017年 Orange-W. All rights reserved. -// - -#import "CQUPTStudentsCell.h" - -@implementation CQUPTStudentsCell - -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsViewController.h deleted file mode 100644 index 0e14bb7..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// CQUPTStudentsViewController.h -// MoblieCQUPT_iOS -// -// Created by xiaogou134 on 2017/8/7. -// Copyright © 2017年 Orange-W. All rights reserved. -// - -#import - -@interface CQUPTStudentsViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsViewController.m deleted file mode 100644 index e4d3fbf..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/CQUPTStudentsViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// CQUPTStudentsViewController.m -// MoblieCQUPT_iOS -// -// Created by xiaogou134 on 2017/8/7. -// Copyright © 2017年 Orange-W. All rights reserved. -// - -#import "CQUPTStudentsViewController.h" - -@interface CQUPTStudentsViewController () - -@end - -@implementation CQUPTStudentsViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCY.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCY.h deleted file mode 100644 index 0d852f1..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCY.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// OriginalCY.h -// SegmentView -// -// Created by xiaogou134 on 2017/8/4. -// Copyright © 2017年 xiaogou134. All rights reserved. -// - -#import - -@interface OriginalCY : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCY.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCY.m deleted file mode 100644 index d5bf681..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCY.m +++ /dev/null @@ -1,75 +0,0 @@ -// -// OriginalCY.m -// SegmentView -// -// Created by xiaogou134 on 2017/8/4. -// Copyright © 2017年 xiaogou134. All rights reserved. -// - -#import "OriginalCY.h" -#import "OriginalCYCell.h" -@interface OriginalCY () -@property (strong, nonatomic)UITableView *tableView; - -@property (nonatomic, copy)NSMutableArray *dataArray; -@property (nonatomic, copy)NSDictionary *dataDic; - -@property (strong, nonatomic)NSArray *imageArray; -@property (strong, nonatomic)NSArray *nameArray; -@property (strong, nonatomic)NSString *timeArray; - -@end - -@implementation OriginalCY - -- (void)viewDidLoad { - [super viewDidLoad]; - _tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height - 120) style:UITableViewStylePlain]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.delegate = self; - _tableView.dataSource = self; - _dataArray = [[NSMutableArray alloc] init]; - [self.view addSubview:_tableView]; - -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - static NSString *reuse = @"cell"; - OriginalCYCell *cell = [tableView dequeueReusableCellWithIdentifier:reuse]; - if (!cell) { - cell = [[OriginalCYCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:reuse]; - - } - cell.textLabel.text = @"测试"; - cell.imageView.image = [UIImage imageNamed:@"军训特辑"]; - return cell; -} -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section -{ - return 1; -} - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView -{ - return 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath -{ - return 60; -} -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCYCell.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCYCell.h deleted file mode 100644 index 23bebbd..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCYCell.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// OriginalCY.h -// SegmentView -// -// Created by xiaogou134 on 2017/8/4. -// Copyright © 2017年 xiaogou134. All rights reserved. -// - -#import - -@interface OriginalCYCell : UITableViewCell - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCYCell.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCYCell.m deleted file mode 100644 index db360ff..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/OriginalCYCell.m +++ /dev/null @@ -1,67 +0,0 @@ -// -// OriginalCY.m -// SegmentView -// -// Created by xiaogou134 on 2017/8/4. -// Copyright © 2017年 xiaogou134. All rights reserved. -// - -#import "OriginalCYCell.h" -#import "PrefixHeader.pch" -@implementation OriginalCYCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier: - reuseIdentifier]; - if (self) { - //添加控件 - UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(20, 20, self.frame.size.height - 20, self.frame.size.height - 20)]; - [self.contentView addSubview: imageView]; - - CGFloat wordWidth = imageView.frame.size.width + 20; - - UILabel *nameLabel = [[UILabel alloc]initWithFrame:CGRectMake(wordWidth, 20, self.frame.size.width - wordWidth, 20)]; - nameLabel.textColor = COLOR_NONEED; - nameLabel.font = [UIFont systemFontOfSize:14]; - [self.contentView addSubview:nameLabel]; - - UILabel *detailLabel = [[UILabel alloc]initWithFrame:CGRectMake(wordWidth,nameLabel.frame.size.height + 20, self.frame.size.width - wordWidth, 40)]; - detailLabel.textColor = COLOR_NONEED; - detailLabel.font = [UIFont systemFontOfSize:28]; - [self.contentView addSubview:detailLabel]; - - UILabel *timeLabel = [[UILabel alloc]initWithFrame:CGRectMake(wordWidth,detailLabel.frame.size.height+ 20, self.frame.size.width - wordWidth, 20)]; - timeLabel.textColor = COLOR_NONEED; - timeLabel.font = [UIFont systemFontOfSize:14]; - [self.contentView addSubview:timeLabel]; - - } - return self; - -} - --(void)setFrame:(CGRect)frame{ - - frame.origin.x = 20; - - frame.size.width -= 2* frame.origin.x; - - frame.size.height -= 10; - - [super setFrame:frame]; - -} - - -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/StuRootViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/StuRootViewController.h deleted file mode 100644 index 9edb130..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/StuRootViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// StuRootViewController.h -// MoblieCQUPT_iOS -// -// Created by xiaogou134 on 2017/8/7. -// Copyright © 2017年 Orange-W. All rights reserved. -// - -#import - -@interface StuRootViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/StuRootViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/StuRootViewController.m deleted file mode 100644 index b29d710..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTBeauty/StuRootViewController.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// StuRootViewController.m -// MoblieCQUPT_iOS -// -// Created by xiaogou134 on 2017/8/7. -// Copyright © 2017年 Orange-W. All rights reserved. -// - -#import "StuRootViewController.h" -#import "OriginalCY.h" -#import "SegmentView.h" -@interface StuRootViewController () - -@end - -@implementation StuRootViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - self.automaticallyAdjustsScrollViewInsets = NO; - OriginalCY * vc1 = [[OriginalCY alloc]init]; - vc1.title = @"原创重邮"; - NSArray *vcArray = @[vc1]; - SegmentView *segmentView = [[SegmentView alloc] initWithFrame:CGRectMake(0, self.navigationController.navigationBar.frame.size.height + 20, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height - self.navigationController.navigationBar.bounds.size.height - 20) andControllers:vcArray]; - [self.view addSubview:segmentView]; - -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/CQUPTDataRootViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/CQUPTDataRootViewController.h deleted file mode 100644 index 1e20340..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/CQUPTDataRootViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// CQUPTDataRootViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface CQUPTDataRootViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/CQUPTDataRootViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/CQUPTDataRootViewController.m deleted file mode 100644 index fa6ad63..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/CQUPTDataRootViewController.m +++ /dev/null @@ -1,68 +0,0 @@ -// -// CQUPTDataRootViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "CQUPTDataRootViewController.h" - -#import "PrefixHeader.pch" - -#import "SegmentView.h" - -//3个VC -#import "MaleToFemaleRatioViewController.h" -#import "MostDifficultSubjectsViewController.h" -#import "EmploymentRateViewController.h" - -@interface CQUPTDataRootViewController () - -@end - -@implementation CQUPTDataRootViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - self.automaticallyAdjustsScrollViewInsets = NO; - MaleToFemaleRatioViewController *VC1 = [[MaleToFemaleRatioViewController alloc] init]; - VC1.title = @"男女比例"; - - MostDifficultSubjectsViewController *VC2 = [[MostDifficultSubjectsViewController alloc] init]; - VC2.title = @"最难科目"; - - EmploymentRateViewController *VC3 = [[EmploymentRateViewController alloc] init]; - VC3.title = @"就业率"; - - NSArray *VCArray = [[NSArray alloc] initWithObjects:VC1, VC2, VC3, nil]; - -// TopTabView *topTabView = [[TopTabView alloc] initWithFrame:CGRectMake(0, self.navigationController.navigationBar.frame.size.height + 20, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height) withTitle:VCArray]; -// topTabView.delegate = self; -// [self.view addSubview:topTabView]; - - SegmentView *segmentView = [[SegmentView alloc] initWithFrame:CGRectMake(0, self.navigationController.navigationBar.frame.size.height + 20, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height - self.navigationController.navigationBar.bounds.size.height - 20) andControllers:VCArray]; - [self.view addSubview:segmentView]; -} - --(void)eventWhenScrollSubViewWithIndex:(NSInteger)index{ - -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/EmploymentRateViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/EmploymentRateViewController.h deleted file mode 100644 index 3fc6fea..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/EmploymentRateViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EmploymentRateViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface EmploymentRateViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/EmploymentRateViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/EmploymentRateViewController.m deleted file mode 100644 index ff9fa66..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/EmploymentRateViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// EmploymentRateViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "EmploymentRateViewController.h" - -@interface EmploymentRateViewController () - -@end - -@implementation EmploymentRateViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/MostDifficultSubjectsViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/MostDifficultSubjectsViewController.h deleted file mode 100644 index fdce8e5..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/MostDifficultSubjectsViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// MostDifficultSubjectsViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface MostDifficultSubjectsViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/MostDifficultSubjectsViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/MostDifficultSubjectsViewController.m deleted file mode 100644 index d110c2d..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/MostDifficultSubjectsViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// MostDifficultSubjectsViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "MostDifficultSubjectsViewController.h" - -@interface MostDifficultSubjectsViewController () - -@end - -@implementation MostDifficultSubjectsViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/StatisticsTable.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/StatisticsTable.h deleted file mode 100644 index 97abf01..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/StatisticsTable.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// StatisticsTable.h -// SegmentView -// -// Created by xiaogou134 on 2017/8/5. -// Copyright © 2017年 xiaogou134. All rights reserved. -// - -#import - -@interface StatisticsTable : UIView -//初始化方法，每次加载前必用 -- (instancetype)initWithFrame:(CGRect)frame With:(NSArray *) color; -//动画方法 -- (void)drawLinesWithDetail:(NSArray *) context With:(NSArray *) color; -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/StatisticsTable.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/StatisticsTable.m deleted file mode 100644 index d79ff4b..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/CQUPTData/StatisticsTable.m +++ /dev/null @@ -1,155 +0,0 @@ -// -// StatisticsTable.m -// SegmentView -// -// Created by xiaogou134 on 2017/8/5. -// Copyright © 2017年 xiaogou134. All rights reserved. -// - -#import "StatisticsTable.h" -#import "POP.h" -#import "PrefixHeader.pch" -@interface StatisticsTable() - -@property NSArray *colors; -@property NSArray *context; -@property CGFloat lineWidth; -@property CGFloat blankWidth; -@end - -@implementation StatisticsTable - -- (void)drawRect:(CGRect)rect { - - - for (int i = 0; i < self.colors.count; i ++) { - UIBezierPath *sidePath1 = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.frame.size.width/2 , self.frame.size.height/2) radius:self.frame.size.width/2 + _lineWidth/2 - (_lineWidth+_blankWidth) * (i+1) + 1 startAngle:0.f endAngle:M_PI * 2 clockwise:YES]; - [self.colors[i][2] setStroke]; - sidePath1.lineWidth = 1.0; - [sidePath1 stroke]; - - UIBezierPath *path = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/2) radius:self.frame.size.width/2 -(_lineWidth+_blankWidth) * (i+1) startAngle:0.f endAngle:M_PI * 2 clockwise:YES]; - [self.colors[i][3] setStroke]; - path.lineWidth = _lineWidth; - [path stroke]; - - UIBezierPath *sidePath2 = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/2) radius:self.frame.size.width/2 - _lineWidth/2 - (_lineWidth+_blankWidth) * (i +1)startAngle:0.f endAngle:M_PI * 2 clockwise:YES]; - [self.colors[i][2] setStroke]; - sidePath2.lineWidth = 1.0; - [sidePath2 stroke]; - } -} -- (instancetype)initWithFrame:(CGRect)frame With:(NSArray *) color{ - self = [super initWithFrame:frame]; - if (self) { - self.colors = color; - self.lineWidth = 18.0; - self.blankWidth = 5.0; - - } - return self; -} -- (void)drawLinesWithDetail:(NSArray*) context With:(NSArray *) color { - for (int i = 0; i < context.count; i ++) { - [self removeFromSuperview]; - UIBezierPath *path = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.frame.size.width/2, self.frame.size.width/2) radius:self.frame.size.width/2 - (_lineWidth+_blankWidth) * (i+1) startAngle:-M_PI/2 endAngle:M_PI * 2 * [context[i][@"score"] floatValue] - M_PI/2 clockwise:YES]; - CAShapeLayer *sideshape = [CAShapeLayer layer]; - CAShapeLayer *shape = [CAShapeLayer layer]; - - - sideshape.lineWidth = 18; - sideshape.fillColor = [UIColor clearColor].CGColor; - sideshape.strokeColor = [(color[i][0]) CGColor]; - sideshape.lineCap = kCALineCapRound; - shape.lineJoin = kCALineCapRound; - sideshape.path = path.CGPath; - [self.layer addSublayer:sideshape]; - - - shape.lineWidth = 16; - shape.fillColor = [UIColor clearColor].CGColor; - shape.strokeColor = [color[i][1] CGColor]; - shape.lineCap = kCALineCapRound; - shape.lineJoin = kCALineJoinRound; - shape.path=path.CGPath; - [sideshape addSublayer:shape]; - - - CABasicAnimation *checkAnimation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"]; - checkAnimation.duration = 1.0f; - checkAnimation.fromValue = @0; - checkAnimation.toValue = @1; - checkAnimation.delegate = self; - checkAnimation.removedOnCompletion = NO; - checkAnimation.fillMode = kCAFillModeForwards; - checkAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - [shape addAnimation:checkAnimation forKey:@"checkAnimation"]; - [sideshape addAnimation:checkAnimation forKey:@"checkAnimation"]; - - UILabel *detailLable = [self newLable:CGRectMake(self.frame.size.width/2 - 35,_lineWidth+ (_lineWidth+_blankWidth)*i - 2, 22, 18) WithContext:[context[i][@"score"] floatValue] WithColor:color[i][0]]; - [self addSubview:detailLable]; - - UILabel *lables = [self detailLable:CGRectMake(self.self.frame.size.width/context.count * i + 50,self.frame.size.width + 20, 50, 50) WithContext:context[i] With:color[i]]; - [self addSubview:lables]; - - } - -} -- (UILabel *) newLable:(CGRect)frame WithContext:(CGFloat )context WithColor:(UIColor *)color{ - UILabel *lab = [[UILabel alloc]init]; - lab.frame = frame; - lab.adjustsFontSizeToFitWidth = YES; - lab.font = [UIFont systemFontOfSize:10]; - POPAnimatableProperty *prop = [POPAnimatableProperty propertyWithName:@"countDown" initializer:^(POPMutableAnimatableProperty *prop) { - prop.writeBlock = ^(id obj,const CGFloat values[]){ - UILabel *label = (UILabel*)obj; - label.text = [NSString stringWithFormat:@"%d%%",(int)(values[0]*100)%100]; - label.textColor = color; - }; - }]; - - POPBasicAnimation *basic = [POPBasicAnimation linearAnimation]; - basic.property = prop; - basic.fromValue = @(0);//从0开始 - basic.toValue = @(context); - basic.duration = 1; - [lab pop_addAnimation:basic forKey:nil]; - return lab; -} - -- (UILabel *) detailLable:(CGRect)frame WithContext:(NSDictionary *)context With:(NSArray *)color{ - UILabel *lable = [[UILabel alloc] initWithFrame:CGRectMake(0, frame.origin.y, frame.size.width, frame.size.height)]; - lable.adjustsFontSizeToFitWidth = YES; - - UIColor *color1 = color[0]; - UIColor *color2 = COLOR_BULE1; - UIColor *color3 = COLOR_YELLOW1; - UIColor *color4 = COLOR_GREEN1; - NSTextAttachment *imageText = [[NSTextAttachment alloc] init]; - if (CGColorEqualToColor(color1.CGColor, color2.CGColor)) { - imageText.image = [UIImage imageNamed:@"蓝色"]; - - } - else if (CGColorEqualToColor(color1.CGColor, color3.CGColor)){ - imageText.image = [UIImage imageNamed:@"黄色"]; - } - else if (CGColorEqualToColor(color1.CGColor, color4.CGColor)){ - imageText.image = [UIImage imageNamed:@"绿色"]; - } - else{ - imageText.image= [UIImage imageNamed:@"粉色"]; - } - NSMutableAttributedString *string = [[NSMutableAttributedString alloc]init]; - NSAttributedString *imagestring = [NSAttributedString attributedStringWithAttachment:imageText]; - NSAttributedString *contextText = [[NSAttributedString alloc]initWithString:context[@"name"]]; - [string appendAttributedString:imagestring]; - [string appendAttributedString:contextText]; - lable.attributedText = string; - POPSpringAnimation *ani = [POPSpringAnimation animationWithPropertyNamed:kPOPLayerPositionX]; - ani.toValue = @(lable.frame.origin.x + frame.origin.x); - ani.springBounciness = 10.0f; - [lable pop_addAnimation:ani forKey:@"position"]; -// NSArray * lables = @[lable, colorLable]; - return lable; -} -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/HomePageViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/HomePageViewController.h deleted file mode 100644 index 810bd3b..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/HomePageViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface HomePageViewController : UIViewController - - -@end - diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/HomePageViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/HomePageViewController.m deleted file mode 100644 index 3b748f4..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/HomePageViewController.m +++ /dev/null @@ -1,171 +0,0 @@ -// -// ViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// -#import "HomePageViewController.h" - -#import "StuStrategyRootViewController.h" -#import "CQUPTDataRootViewController.h" -#import "StuRootViewController.h" -@interface HomePageViewController () - -@end - -@implementation HomePageViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - [self layoutButton]; -} - - -- (void)tapFirstBtn { - StuStrategyRootViewController *stuVC = [[StuStrategyRootViewController alloc] init]; - - [self.navigationController pushViewController:stuVC animated:YES]; -} -- (void)tapSecondBtn{ - StuRootViewController *BeautyVC = [[StuRootViewController alloc]init]; - [self.navigationController pushViewController:BeautyVC animated:YES]; - -} -- (void)tapThirdBtn { - CQUPTDataRootViewController *CQUPTDataVC = [[CQUPTDataRootViewController alloc] init]; - [self.navigationController pushViewController:CQUPTDataVC animated:YES]; -} - -- (void)layoutButton { - -/* - 邮子攻略 -*/ - UIButton *firstBtn = [[UIButton alloc] init]; - firstBtn.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:firstBtn]; - firstBtn.translatesAutoresizingMaskIntoConstraints = NO; - - [firstBtn setBackgroundImage:[UIImage imageNamed:@"邮子攻略"] forState:UIControlStateNormal]; -//取消高亮 but why?... - firstBtn.adjustsImageWhenDisabled = NO; - firstBtn.adjustsImageWhenHighlighted = NO; -// firstBtn.highlighted = NO; - - [firstBtn addTarget:self action:@selector(tapFirstBtn) forControlEvents:UIControlEventTouchUpInside]; - - - NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:firstBtn attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeft multiplier:1.0 constant:18]; - [self.view addConstraint:leftConstraint]; - - - NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:firstBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeRight multiplier:1.0 constant:-18]; - [self.view addConstraint:rightConstraint]; - - - NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:firstBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeTop multiplier:1.0 constant:84]; - [self.view addConstraint:topConstraint]; - - double width = [UIScreen mainScreen].bounds.size.width - 36.0; - - double heigth = 121/340.0 * width; - NSLayoutConstraint *heigthConstraint = [NSLayoutConstraint constraintWithItem:firstBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:heigth]; - [firstBtn addConstraint:heigthConstraint]; - - -/* - 重邮风采 - */ - UIButton *secBtn = [[UIButton alloc] init]; - secBtn.backgroundColor = [UIColor yellowColor]; - [self.view addSubview:secBtn]; - secBtn.translatesAutoresizingMaskIntoConstraints = NO; - secBtn.backgroundColor = [UIColor whiteColor]; - [secBtn addTarget:self action:@selector(tapSecondBtn)forControlEvents:UIControlEventTouchUpInside]; - [secBtn setBackgroundImage:[UIImage imageNamed:@"重邮风采"] forState:UIControlStateNormal]; - secBtn.adjustsImageWhenDisabled = NO; - secBtn.adjustsImageWhenHighlighted = NO; - -// [secBtn addTarget:self action:@selector(tapSecBtn) forControlEvents:UIControlEventTouchUpInside]; - - NSLayoutConstraint *leftConstraint1 = [NSLayoutConstraint constraintWithItem:secBtn attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeft multiplier:1.0 constant:18]; - [self.view addConstraint:leftConstraint1]; - - - NSLayoutConstraint *rightConstraint1 = [NSLayoutConstraint constraintWithItem:secBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeRight multiplier:1.0 constant:-18]; - [self.view addConstraint:rightConstraint1]; - - - NSLayoutConstraint *topConstraint1 = [NSLayoutConstraint constraintWithItem:secBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:firstBtn attribute:NSLayoutAttributeBottom multiplier:1.0 constant:27]; - [self.view addConstraint:topConstraint1]; - - NSLayoutConstraint *heigthConstraint1 = [NSLayoutConstraint constraintWithItem:secBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:heigth]; - [secBtn addConstraint:heigthConstraint1]; - -/* - 重邮数据 - */ - UIButton *thirdBtn = [[UIButton alloc] init]; - thirdBtn.backgroundColor = [UIColor greenColor]; - [self.view addSubview:thirdBtn]; - thirdBtn.translatesAutoresizingMaskIntoConstraints = NO; - thirdBtn.backgroundColor = [UIColor whiteColor]; - - [thirdBtn setBackgroundImage:[UIImage imageNamed:@"重邮数据"] forState:UIControlStateNormal]; - thirdBtn.adjustsImageWhenDisabled = NO; - thirdBtn.adjustsImageWhenHighlighted = NO; - - [thirdBtn addTarget:self action:@selector(tapThirdBtn) forControlEvents:UIControlEventTouchUpInside]; - - NSLayoutConstraint *leftConstraint2 = [NSLayoutConstraint constraintWithItem:thirdBtn attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeft multiplier:1.0 constant:18]; - [self.view addConstraint:leftConstraint2]; - - - NSLayoutConstraint *rightConstraint2 = [NSLayoutConstraint constraintWithItem:thirdBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeRight multiplier:1.0 constant:-18]; - [self.view addConstraint:rightConstraint2]; - - - NSLayoutConstraint *topConstraint2 = [NSLayoutConstraint constraintWithItem:thirdBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:secBtn attribute:NSLayoutAttributeBottom multiplier:1.0 constant:27]; - [self.view addConstraint:topConstraint2]; - - NSLayoutConstraint *heigthConstraint2 = [NSLayoutConstraint constraintWithItem:thirdBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:heigth]; - [thirdBtn addConstraint:heigthConstraint2]; - -/* - 军训热辑 - */ - UIButton *fourthBtn = [[UIButton alloc] init]; - fourthBtn.backgroundColor = [UIColor blueColor]; - [self.view addSubview:fourthBtn]; - fourthBtn.translatesAutoresizingMaskIntoConstraints = NO; - fourthBtn.backgroundColor = [UIColor whiteColor]; - - [fourthBtn setBackgroundImage:[UIImage imageNamed:@"军训特辑"] forState:UIControlStateNormal]; - fourthBtn.adjustsImageWhenDisabled = NO; - fourthBtn.adjustsImageWhenHighlighted = NO; - - NSLayoutConstraint *leftConstraint3 = [NSLayoutConstraint constraintWithItem:fourthBtn attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeft multiplier:1.0 constant:18]; - [self.view addConstraint:leftConstraint3]; - - - NSLayoutConstraint *rightConstraint3 = [NSLayoutConstraint constraintWithItem:fourthBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeRight multiplier:1.0 constant:-18]; - [self.view addConstraint:rightConstraint3]; - - - NSLayoutConstraint *topConstraint3 = [NSLayoutConstraint constraintWithItem:fourthBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:thirdBtn attribute:NSLayoutAttributeBottom multiplier:1.0 constant:27]; - [self.view addConstraint:topConstraint3]; - - NSLayoutConstraint *heigthConstraint3 = [NSLayoutConstraint constraintWithItem:fourthBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:heigth]; - [fourthBtn addConstraint:heigthConstraint3]; -} - - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/MaleToFemaleRatioViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/MaleToFemaleRatioViewController.h deleted file mode 100644 index 388b21d..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/MaleToFemaleRatioViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// MaleToFemaleRatioViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface MaleToFemaleRatioViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/MaleToFemaleRatioViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/MaleToFemaleRatioViewController.m deleted file mode 100644 index d642d41..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/MaleToFemaleRatioViewController.m +++ /dev/null @@ -1,392 +0,0 @@ -// -// MaleToFemaleRatioViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/5. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import -#import "MaleToFemaleRatioViewController.h" - -@interface MaleToFemaleRatioViewController () -@property NSMutableArray *array; -@property (strong, nonatomic) UIPickerView *pickerView; -@property (strong, nonatomic) UIButton *collegeBtn; -@property (strong, nonatomic) UIToolbar *toolBar; -@property (strong, nonatomic) UIView *backgroundGrayView;//遮盖来显示灰色的view -@property (strong, nonatomic) UIView *rootView;//放置toolBar和pickerView的view -@property (strong, nonatomic) UIView *blueView;//pickerView每一个cell的背景色view -@property NSInteger didSeclecter; - -@end - -@implementation MaleToFemaleRatioViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - UIView *animateView = [[UIView alloc] initWithFrame:CGRectMake(50, 200, 194, 168)]; - animateView.backgroundColor = [UIColor orangeColor]; - [self.view addSubview:animateView]; - - [self layoutPickerView]; - [self layoutCollegeButton]; -} - - -- (void)layoutCollegeButton { - UIButton *btn = [[UIButton alloc] init]; - btn.backgroundColor = [UIColor colorWithRed:235/255.0 green:245/255.0 blue:250/255.0 alpha:1.0]; - btn.layer.borderWidth = 1; - btn.layer.borderColor = [UIColor colorWithRed:233/255.0 green:233/255.0 blue:233/255.0 alpha:1.0].CGColor; - btn.translatesAutoresizingMaskIntoConstraints = NO; - btn.layer.cornerRadius = 20; - - [btn setTitle:@"请选择学院" forState:UIControlStateNormal]; - [btn setTitleColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5] forState:UIControlStateNormal]; - //左对齐 - btn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - //让向右偏移16像素，不会紧贴着很难看 - btn.titleEdgeInsets = UIEdgeInsetsMake(0, 16, 0, 0); - - [btn addTarget:self action:@selector(tapCollegeBtn) forControlEvents:UIControlEventTouchUpInside]; - - btn.titleLabel.font = [UIFont systemFontOfSize:14.0]; - [btn setTitleColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5] forState:UIControlStateNormal]; - - - [self.view addSubview:btn]; - self.collegeBtn = btn; - -/* - 输出显示这两个值为0 - 实际值 - self.navigationController.navigationBar.frame.size.height = 44 - [[TopTabView alloc] init].frame.size.height = 47 - 状态栏20 - - double top = 131 - [[TopTabView alloc] init].frame.size.height - self.navigationController.navigationBar.frame.size.height - 20; -*/ - - NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:btn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeTop multiplier:1.0 constant:137 - 44 - 47- 20]; - [self.view addConstraint:topConstraint]; - - NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:btn attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeft multiplier:1.0 constant:18]; - [self.view addConstraint:leftConstraint]; - - NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:btn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeRight multiplier:1.0 constant:-18]; - [self.view addConstraint:rightConstraint]; - - - double height = 41 / 340.0 * ([UIScreen mainScreen].bounds.size.width - 36); - - NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:btn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:height]; - [self.view addConstraint:heightConstraint]; -} - - -- (void)tapCollegeBtn { -//获取window - UIWindow *window = [UIApplication sharedApplication].keyWindow; - self.backgroundGrayView= [[UIView alloc] initWithFrame:[UIScreen mainScreen].bounds]; - self.backgroundGrayView.backgroundColor = [UIColor brownColor]; - -//创建遮盖view - self.backgroundGrayView = [[UIView alloc] init]; - [window addSubview:self.backgroundGrayView]; - self.backgroundGrayView.translatesAutoresizingMaskIntoConstraints = NO; - self.backgroundGrayView.backgroundColor = [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:0.7]; - - NSLayoutConstraint *height = [NSLayoutConstraint constraintWithItem:self.backgroundGrayView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:[UIScreen mainScreen].bounds.size.height - self.rootView.bounds.size.height]; - [self.backgroundGrayView addConstraint:height]; - - NSLayoutConstraint *width = [NSLayoutConstraint constraintWithItem:self.backgroundGrayView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:[UIScreen mainScreen].bounds.size.width]; - [self.backgroundGrayView addConstraint:width]; - - NSLayoutConstraint *bottom = [NSLayoutConstraint constraintWithItem:self.backgroundGrayView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:window attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-self.pickerView.bounds.size.height]; - [window addConstraint:bottom]; - -//显示选择器界面 - self.pickerView.hidden = NO; - self.toolBar.hidden = NO; - self.blueView.hidden = NO; - -#pragma mark - 手势 -//添加返回手势 - UITapGestureRecognizer *tapToBackGesture = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapToBackAction)]; - [self.backgroundGrayView addGestureRecognizer:tapToBackGesture]; -} - -- (void)tapToBackAction { - NSInteger i = [self.pickerView selectedRowInComponent:0]; - NSLog(@"----> %ld", (long)i); - if (self.pickerView.hidden == YES) { - ; - } - else { - self.pickerView.hidden = YES; - self.toolBar.hidden = YES; - self.blueView.hidden = YES; - } - - [self.backgroundGrayView removeFromSuperview]; -} - -- (void)tapPickerBtn { - if (self.pickerView.hidden == YES) { - ; - } - else { - self.pickerView.hidden = YES; - self.toolBar.hidden = YES; - self.blueView.hidden = YES; - } - - [self.backgroundGrayView removeFromSuperview]; - - NSInteger i = [self.pickerView selectedRowInComponent:0]; - -#pragma mark - 网络请求 -//网络请求 -// NSDictionary *parameters = @{ -// @"RequestType":@"SexRatio" -// }; -// -// NSString *url = @"http://www.yangruixin.com/test/apiRatio.php"; -// -// AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; -// manager.responseSerializer = [AFJSONResponseSerializer serializer]; -// manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html",@"text/plain", nil]; -// [manager POST:url parameters:parameters success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseobject) { -// NSDictionary *dic = responseobject; -// NSLog(@"%@", dic); -// }failure:^(NSURLSessionDataTask * _Nonnull task, NSError * _Nonnull error) { -// NSLog(@"请求失败,error:%@", error); -// }]; -} - - -- (void)layoutPickerView { - -#pragma mark - rootView -// pickerView和toolBar放在这一个view上 - UIView *rootView = [[UIView alloc] init]; - rootView.translatesAutoresizingMaskIntoConstraints = NO; - [self.view addSubview:rootView]; - self.rootView = rootView; - -//布局rootView - double height = 226 / 375.0 * [UIScreen mainScreen].bounds.size.width; - - NSLayoutConstraint *widthConstraint1 = [NSLayoutConstraint constraintWithItem:rootView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:[UIScreen mainScreen].bounds.size.width]; - [rootView addConstraint:widthConstraint1]; - - - NSLayoutConstraint *heightConstraint1 = [NSLayoutConstraint constraintWithItem:rootView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:height]; - [rootView addConstraint:heightConstraint1]; - - NSLayoutConstraint *bottomConstraint1 = [NSLayoutConstraint constraintWithItem:rootView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0]; - [self.view addConstraint:bottomConstraint1]; - -//创建背景 一条蓝色view - UIView *blueView = [[UIView alloc] init]; - blueView.hidden = YES; - blueView.backgroundColor = [UIColor colorWithRed:101/255.0 green:178/255.0 blue:255/255.0 alpha:1]; - blueView.translatesAutoresizingMaskIntoConstraints = NO; - [rootView addSubview:blueView]; - self.blueView = blueView; - - NSLayoutConstraint *widthCons = [NSLayoutConstraint constraintWithItem:blueView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:[UIScreen mainScreen].bounds.size.width]; - [blueView addConstraint:widthCons]; - - NSLayoutConstraint *heightCons = [NSLayoutConstraint constraintWithItem:blueView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:35]; - [blueView addConstraint:heightCons]; - - NSLayoutConstraint *topCons = [NSLayoutConstraint constraintWithItem:blueView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:rootView attribute:NSLayoutAttributeTop multiplier:1.0 constant:height/2.0 - 35/2.0]; - [rootView addConstraint:topCons]; - - -#pragma mark - pickerView -//创建pickerView - UIPickerView *pickerView = [[UIPickerView alloc] init]; -// pickerView.alpha = 0.3; -//不影响子视图透明度用[UIColor colorWithRed:1 green:1 blue:1 alpha:0.3]设置透明度 - pickerView.backgroundColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.3]; - pickerView.translatesAutoresizingMaskIntoConstraints = NO; - pickerView.hidden = YES; - pickerView.showsSelectionIndicator = NO; - pickerView.delegate = self; - pickerView.dataSource = self; - self.pickerView = pickerView; - [rootView addSubview:pickerView]; - - - NSLayoutConstraint *widthConstraint = [NSLayoutConstraint constraintWithItem:pickerView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:[UIScreen mainScreen].bounds.size.width]; - [pickerView addConstraint:widthConstraint]; - - - NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:pickerView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:height]; - [pickerView addConstraint:heightConstraint]; - - NSLayoutConstraint *bottomConstraint = [NSLayoutConstraint constraintWithItem:pickerView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0]; - [self.view addConstraint:bottomConstraint]; - - -#pragma mark - toolBar -//完成按钮放工具栏 - UIToolbar *toolBar = [[UIToolbar alloc] init]; -// UIToolbar *toolBar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, 375, 35)]; - toolBar.translatesAutoresizingMaskIntoConstraints = NO; - [rootView addSubview:toolBar]; - toolBar.barTintColor = [UIColor whiteColor]; - toolBar.clearsContextBeforeDrawing = YES; - toolBar.hidden = YES; - self.toolBar = toolBar; - - - NSLayoutConstraint *widthConstraint2 = [NSLayoutConstraint constraintWithItem:toolBar attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:[UIScreen mainScreen].bounds.size.width]; - [toolBar addConstraint:widthConstraint2]; - - - NSLayoutConstraint *heightConstraint2 = [NSLayoutConstraint constraintWithItem:toolBar attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:40]; - [toolBar addConstraint:heightConstraint2]; - - NSLayoutConstraint *topConstraint2 = [NSLayoutConstraint constraintWithItem:toolBar attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:rootView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0]; - [rootView addConstraint:topConstraint2]; - - -#pragma mark - toolBar's button -//toolBar上添加一个button - UIButton *toolBtn = [[UIButton alloc] init]; - toolBtn.translatesAutoresizingMaskIntoConstraints = NO; - toolBtn.backgroundColor = [UIColor whiteColor]; - [toolBtn setTitle:@"完成" forState:UIControlStateNormal]; - [toolBar addSubview:toolBtn]; - [toolBtn setTitleColor:[UIColor colorWithRed:129/255.0 green:192255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal]; - toolBtn.titleLabel.font = [UIFont systemFontOfSize:15.0]; - [toolBtn addTarget:self action:@selector(tapPickerBtn) forControlEvents:UIControlEventTouchUpInside]; - - NSLayoutConstraint *widthConstraint3 = [NSLayoutConstraint constraintWithItem:toolBtn attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:39]; - [toolBtn addConstraint:widthConstraint3]; - - - NSLayoutConstraint *heightConstraint3 = [NSLayoutConstraint constraintWithItem:toolBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 constant:24]; - [toolBtn addConstraint:heightConstraint3]; - - NSLayoutConstraint *right = [NSLayoutConstraint constraintWithItem:toolBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:toolBar attribute:NSLayoutAttributeRight multiplier:1.0 constant:-10]; - [toolBar addConstraint:right]; - - NSLayoutConstraint *top = [NSLayoutConstraint constraintWithItem:toolBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:toolBar attribute:NSLayoutAttributeTop multiplier:1.0 constant:10]; - [toolBar addConstraint:top]; -} - -//1个表盘 --(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView -{ - return 1; -} - - -//指定每个表盘上有几行数据 --(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component -{ - return 8; -} - -- (CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component { - return 40; -} - -//- (NSString *)pickerView:(UIPickerView *)pickerView -//titleForRow:(NSInteger)row forComponent:(NSInteger)component -//{ -// return @"jjkl";; -//} - - -//- (NSAttributedString *)pickerView:(UIPickerView *)pickerView attributedTitleForRow:(NSInteger)row forComponent:(NSInteger)component{ -// -// NSDictionary * attrDic = @{NSForegroundColorAttributeName:[UIColor blueColor]}; -// -// NSAttributedString * attrString = [[NSAttributedString alloc] initWithString:@"123" attributes:attrDic]; -// return attrString; -//} - - -- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{ - UIView *myView= [[UIView alloc]init]; - myView.backgroundColor= [UIColor clearColor]; - - UILabel *myLabel = [[UILabel alloc] init]; - myLabel.text = @"hahahahahahah"; - myLabel.translatesAutoresizingMaskIntoConstraints = NO; - myLabel.textAlignment = NSTextAlignmentCenter; - myLabel.font = [UIFont systemFontOfSize:14]; - [myView addSubview:myLabel]; - -//选中行改变颜色、字体大小 - if (self.didSeclecter == row) { - myLabel.textColor = [UIColor whiteColor]; - myLabel.font = [UIFont systemFontOfSize:17]; - } - else { - myLabel.textColor = [UIColor grayColor]; - } - - - - NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:myLabel attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:myView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0]; - [myView addConstraint:leftConstraint]; - - NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:myLabel attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:myView attribute:NSLayoutAttributeRight multiplier:1.0 constant:0]; - [myView addConstraint:rightConstraint]; - - - - NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:myLabel attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:myView attribute:NSLayoutAttributeTop multiplier:1.0 constant:9]; - [myView addConstraint:topConstraint]; - - NSLayoutConstraint *bottomConstraint = [NSLayoutConstraint constraintWithItem:myLabel attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:myView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-10]; - [myView addConstraint:bottomConstraint]; - - for (UIView *view in pickerView.subviews) { - if (view.frame.size.height<1) { - view.backgroundColor = [UIColor clearColor]; - } - } - - return myView; -} - -- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{ -// UIView *firstView = [pickerView viewForRow:0 forComponent:component]; -// UIView *v = [pickerView viewForRow:row forComponent:component]; -// v.backgroundColor = [UIColor colorWithRed:101/255.0 green:178/255.0 blue:255/255.0 alpha:1.0]; -// -// UIView *v2 = [pickerView viewForRow:row + 1 forComponent:component]; -// v2.backgroundColor = [UIColor colorWithRed:101/255.0 green:178/255.0 blue:255/255.0 alpha:1.0]; -// -// UIView *v0 = [pickerView viewForRow:row-1 forComponent:component]; -// v0.backgroundColor = [UIColor colorWithRed:101/255.0 green:178/255.0 blue:255/255.0 alpha:1.0]; - - self.didSeclecter = row; - [self.pickerView reloadAllComponents]; -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/SegmentView.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/SegmentView.h deleted file mode 100755 index 13c0d92..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/SegmentView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// SegmentView.h -// GGSgmentView -// -// Created by GQuEen on 16/8/7. -// Copyright © 2016年 GegeChen. All rights reserved. -// - -#import - -@protocol SegmentViewScrollerViewDelegate - -@required - -- (void)eventWhenScrollSubViewWithIndex:(NSInteger)index; - -@end - -@interface SegmentView : UIView - -@property (weak,nonatomic) id eventDelegate; - -- (instancetype)initWithFrame:(CGRect)frame andControllers:(NSArray *)controllers; - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/SegmentView.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/SegmentView.m deleted file mode 100755 index 65823fe..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/SegmentView.m +++ /dev/null @@ -1,138 +0,0 @@ -// -// SegmentView.m -// GGSgmentView -// -// Created by GQuEen on 16/8/7. -// Copyright © 2016年 GegeChen. All rights reserved. -// -#import "SegmentView.h" -#define kTitleHeight (self.height*50/667) -@interface SegmentView() -@property NSArray *controllers; -@property UIScrollView *mainScrollView; -@property UIScrollView *titleScrollView; -@property UIView *sliderView; -@property NSInteger currentIndex; -@property CGFloat titleBtnWidth; -@property NSMutableArray *btnArray; -@end - -@implementation SegmentView -- (instancetype)initWithFrame:(CGRect)frame andControllers:(NSArray *)controllers{ - self = [self initWithFrame:frame]; - if(self){ - self.controllers = controllers; - if (self.controllers.count >=4) { - self.titleBtnWidth = self.width/4; - } - else{ - self.titleBtnWidth = self.width/self.controllers.count; - } - [self initWithTitleView]; - [self initWithMainView]; - } - return self; - -} - -- (void)initWithTitleView { - _titleScrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, self.width, kTitleHeight)]; - _titleScrollView.contentSize = CGSizeMake(self.titleBtnWidth * self.controllers.count,kTitleHeight); - _titleScrollView.bounces = NO; - _titleScrollView.showsHorizontalScrollIndicator = NO; - _titleScrollView.showsVerticalScrollIndicator = NO; - [_titleScrollView flashScrollIndicators]; - - UIView *cuttingLine = [[UIView alloc]initWithFrame:CGRectMake(0, kTitleHeight-1, _titleScrollView.contentSize.width, 1)]; - cuttingLine.backgroundColor = [UIColor colorWithRed:226/255.0 green:227/255.0 blue:229/255.0 alpha:1]; - - _btnArray = [NSMutableArray array]; - for (int i = 0; i < self.controllers.count; i ++) { - UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom]; - btn.frame = CGRectMake(i*self.titleBtnWidth, 0, self.titleBtnWidth, kTitleHeight); - [btn setTitle:self.controllers[i].title forState:UIControlStateNormal]; - btn.tag = i; - btn.titleLabel.font = [UIFont systemFontOfSize:15]; - [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; - [btn setTitleColor:MAIN_COLOR forState:UIControlStateSelected]; - [btn addTarget:self action:@selector(clickBtn:) forControlEvents:UIControlEventTouchUpInside]; - if (i == 0) { - btn.selected = YES; - _currentIndex = 0; - } - [_titleScrollView addSubview:btn]; - [_btnArray addObject:btn]; - } - _sliderView = [[UIView alloc]initWithFrame:CGRectMake(0, kTitleHeight-2, self.titleBtnWidth, 2)]; - _sliderView.backgroundColor = MAIN_COLOR; - - [_titleScrollView addSubview:cuttingLine]; - [_titleScrollView addSubview:self.sliderView]; - [self addSubview:self.titleScrollView]; -} - -- (void)initWithMainView { - _mainScrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0, kTitleHeight, self.width, self.height-kTitleHeight)]; - - _mainScrollView.showsHorizontalScrollIndicator = NO; - _mainScrollView.showsVerticalScrollIndicator = NO; - _mainScrollView.contentSize = CGSizeMake(self.controllers.count*self.width, 0); - - _mainScrollView.pagingEnabled = YES; - _mainScrollView.bounces = NO; - _mainScrollView.delegate = self; - - for (int i = 0; i < _controllers.count; i++) { - UIView *view = self.controllers[i].view; - view.frame = CGRectMake(i * self.width, 0, self.width, self.height-kTitleHeight); - [_mainScrollView addSubview:view]; - } - - [self addSubview:self.mainScrollView]; - -} - -- (void)clickBtn:(UIButton *)sender { - - [UIView animateWithDuration:0.2f animations:^{ - _mainScrollView.contentOffset = CGPointMake(sender.tag * self.width, 0); - _sliderView.frame = CGRectMake(sender.tag * _titleBtnWidth, kTitleHeight - 2, _titleBtnWidth, 2); - } completion:nil]; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - - NSInteger currentIndex = round(_mainScrollView.contentOffset.x / self.width); - - if (currentIndex != self.currentIndex) { - [UIView animateWithDuration:0.2f animations:^{ - if ([self.eventDelegate respondsToSelector:@selector(eventWhenScrollSubViewWithIndex:)]) { - [self.eventDelegate eventWhenScrollSubViewWithIndex:currentIndex]; - } - self.btnArray[self.currentIndex].selected = NO; - self.currentIndex = currentIndex; - self.btnArray[self.currentIndex].selected = YES; - _sliderView.frame = CGRectMake(self.currentIndex * _titleBtnWidth, kTitleHeight - 2, _titleBtnWidth, 2); - CGPoint contentOffset = self.titleScrollView.contentOffset; - if (self.btnArray[self.currentIndex].frame.origin.x < self.width/2) { - [_titleScrollView setContentOffset:CGPointMake(0, contentOffset.y) animated:YES]; - } else if (self.titleScrollView.contentSize.width - self.btnArray[self.currentIndex].frame.origin.x <= self.width/2) { - [_titleScrollView setContentOffset:CGPointMake(self.controllers.count*_titleBtnWidth-self.width, contentOffset.y) animated:YES]; - } else { - [_titleScrollView setContentOffset:CGPointMake(self.btnArray[self.currentIndex].frame.origin.x-self.width/2+self.titleBtnWidth/2, contentOffset.y) animated:YES]; - } - } completion:nil]; - } - -} - - -/* -// Only override drawRect: if you perform custom drawing. -// An empty implementation adversely affects performance during animation. -- (void)drawRect:(CGRect)rect { - // Drawing code -} -*/ - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/BeautyViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/BeautyViewController.h deleted file mode 100644 index c6e3138..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/BeautyViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// BeautyViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface BeautyViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/BeautyViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/BeautyViewController.m deleted file mode 100644 index d5b5f61..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/BeautyViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// BeautyViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "BeautyViewController.h" - -@interface BeautyViewController () - -@end - -@implementation BeautyViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CampusEnvironmentViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CampusEnvironmentViewController.h deleted file mode 100644 index e16410d..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CampusEnvironmentViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// CampusEnvironmentViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface CampusEnvironmentViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CampusEnvironmentViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CampusEnvironmentViewController.m deleted file mode 100644 index 0e0d024..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CampusEnvironmentViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// CampusEnvironmentViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "CampusEnvironmentViewController.h" - -@interface CampusEnvironmentViewController () - -@end - -@implementation CampusEnvironmentViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CanteenViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CanteenViewController.h deleted file mode 100644 index 750c1bb..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CanteenViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// CanteenViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface CanteenViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CanteenViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CanteenViewController.m deleted file mode 100644 index 3c8af70..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/CanteenViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// CanteenViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "CanteenViewController.h" - -@interface CanteenViewController () - -@end - -@implementation CanteenViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/DailyLifeViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/DailyLifeViewController.h deleted file mode 100644 index c7e42cf..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/DailyLifeViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// DailyLifeViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface DailyLifeViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/DailyLifeViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/DailyLifeViewController.m deleted file mode 100644 index e66516e..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/DailyLifeViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// DailyLifeViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "DailyLifeViewController.h" - -@interface DailyLifeViewController () - -@end - -@implementation DailyLifeViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/FoodViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/FoodViewController.h deleted file mode 100644 index 242780a..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/FoodViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// FoodViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface FoodViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/FoodViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/FoodViewController.m deleted file mode 100644 index 90c61fa..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/FoodViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// FoodViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "FoodViewController.h" - -@interface FoodViewController () - -@end - -@implementation FoodViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/IntroductionViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/IntroductionViewController.h deleted file mode 100644 index c5c9ff5..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/IntroductionViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// IntroductionViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface IntroductionViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/IntroductionViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/IntroductionViewController.m deleted file mode 100644 index 915d071..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/IntroductionViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// IntroductionViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "IntroductionViewController.h" - -@interface IntroductionViewController () - -@end - -@implementation IntroductionViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/QQGroupViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/QQGroupViewController.h deleted file mode 100644 index e242482..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/QQGroupViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// QQGroupViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface QQGroupViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/QQGroupViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/QQGroupViewController.m deleted file mode 100644 index 887278c..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/QQGroupViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// QQGroupViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "QQGroupViewController.h" - -@interface QQGroupViewController () - -@end - -@implementation QQGroupViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuBedroomViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuBedroomViewController.h deleted file mode 100644 index 1ab9f19..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuBedroomViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// StuBedroomViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface StuBedroomViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuBedroomViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuBedroomViewController.m deleted file mode 100644 index 8e8b145..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuBedroomViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// StuBedroomViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import "StuBedroomViewController.h" - -@interface StuBedroomViewController () - -@end - -@implementation StuBedroomViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuStrategyRootViewController.h b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuStrategyRootViewController.h deleted file mode 100644 index 946c62f..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuStrategyRootViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// StuStrategyRootViewController.h -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// - -#import - -@interface StuStrategyRootViewController : UIViewController - -@end diff --git a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuStrategyRootViewController.m b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuStrategyRootViewController.m deleted file mode 100644 index 5b5d3eb..0000000 --- a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/StuStrategyDetailVC/StuStrategyRootViewController.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// StuStrategyRootViewController.m -// TestLayoutButton -// -// Created by helloworld on 2017/8/4. -// Copyright © 2017年 topkid. All rights reserved. -// -#import "SegmentView.h" - -#import "StuStrategyRootViewController.h" - -//8个VC -#import "CampusEnvironmentViewController.h" -#import "StuBedroomViewController.h" -#import "CanteenViewController.h" -#import "IntroductionViewController.h" -#import "QQGroupViewController.h" -#import "DailyLifeViewController.h" -#import "FoodViewController.h" -#import "BeautyViewController.h" - -@interface StuStrategyRootViewController () - -@end - -@implementation StuStrategyRootViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - self.automaticallyAdjustsScrollViewInsets = NO; - CampusEnvironmentViewController *VC1 = [[CampusEnvironmentViewController alloc] init]; - VC1.title = @"校园环境"; - StuBedroomViewController *VC2 = [[StuBedroomViewController alloc] init]; - VC2.title = @"学生寝室"; - CanteenViewController *VC3 = [[CanteenViewController alloc] init]; - VC3.title = @"学校食堂"; - IntroductionViewController *VC4 = [[IntroductionViewController alloc] init]; - VC4.title = @"入学须知"; - QQGroupViewController *VC5 = [[QQGroupViewController alloc] init]; - VC5.title = @"QQ群"; - DailyLifeViewController *VC6 = [[DailyLifeViewController alloc] init]; - VC6.title = @"日常生活"; - FoodViewController *VC7 = [[FoodViewController alloc] init]; - VC7.title = @"周边美食"; - BeautyViewController *VC8 = [[BeautyViewController alloc] init]; - VC8.title = @"周边美景"; - - NSArray *VCArray = [[NSArray alloc] initWithObjects:VC1, VC2, VC3, VC4, VC5, VC6, VC7, VC8, nil]; - -// TopTabView *topTabView = [[TopTabView alloc] initWithFrame:CGRectMake(0, self.navigationController.navigationBar.frame.size.height + 20, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height) withTitle:VCArray]; -// -// [self.view addSubview:topTabView]; - - SegmentView *segmentView = [[SegmentView alloc] initWithFrame:CGRectMake(0, self.navigationController.navigationBar.frame.size.height + 20, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height - self.navigationController.navigationBar.bounds.size.height - 20) andControllers:VCArray]; - [self.view addSubview:segmentView]; -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -/* -#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 diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\345\206\233\350\256\255\347\211\271\350\276\221@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\345\206\233\350\256\255\347\211\271\350\276\221@2x.png" deleted file mode 100644 index b3a4407..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\345\206\233\350\256\255\347\211\271\350\276\221@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\345\206\233\350\256\255\347\211\271\350\276\221@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\345\206\233\350\256\255\347\211\271\350\276\221@3x.png" deleted file mode 100644 index 5623625..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\345\206\233\350\256\255\347\211\271\350\276\221@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\262\211\350\211\262@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\262\211\350\211\262@2x.png" deleted file mode 100644 index 09b0b3e..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\262\211\350\211\262@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\262\211\350\211\262@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\262\211\350\211\262@3x.png" deleted file mode 100644 index f71b70c..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\262\211\350\211\262@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\273\277\350\211\262@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\273\277\350\211\262@2x.png" deleted file mode 100644 index 1359124..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\273\277\350\211\262@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\273\277\350\211\262@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\273\277\350\211\262@3x.png" deleted file mode 100644 index df01e4b..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\347\273\277\350\211\262@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\223\235\350\211\262@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\223\235\350\211\262@2x.png" deleted file mode 100644 index e9373e8..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\223\235\350\211\262@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\223\235\350\211\262@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\223\235\350\211\262@3x.png" deleted file mode 100644 index 8a2a96e..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\223\235\350\211\262@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\277\224\345\233\236@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\277\224\345\233\236@2x.png" deleted file mode 100644 index fa17f6a..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\277\224\345\233\236@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\277\224\345\233\236@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\277\224\345\233\236@3x.png" deleted file mode 100644 index 72dbb74..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\350\277\224\345\233\236@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\202\256\345\255\220\346\224\273\347\225\245@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\202\256\345\255\220\346\224\273\347\225\245@2x.png" deleted file mode 100644 index ef19a8b..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\202\256\345\255\220\346\224\273\347\225\245@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\202\256\345\255\220\346\224\273\347\225\245@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\202\256\345\255\220\346\224\273\347\225\245@3x.png" deleted file mode 100644 index 4c20f6e..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\202\256\345\255\220\346\224\273\347\225\245@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\346\225\260\346\215\256@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\346\225\260\346\215\256@2x.png" deleted file mode 100644 index 052756a..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\346\225\260\346\215\256@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\346\225\260\346\215\256@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\346\225\260\346\215\256@3x.png" deleted file mode 100644 index 0a32d57..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\346\225\260\346\215\256@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\351\243\216\351\207\207@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\351\243\216\351\207\207@2x.png" deleted file mode 100644 index dc5771b..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\351\243\216\351\207\207@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\351\243\216\351\207\207@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\351\243\216\351\207\207@3x.png" deleted file mode 100644 index 62e3107..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\207\215\351\202\256\351\243\216\351\207\207@3x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\273\204\350\211\262@2x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\273\204\350\211\262@2x.png" deleted file mode 100644 index 14c8088..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\273\204\350\211\262@2x.png" and /dev/null differ diff --git "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\273\204\350\211\262@3x.png" "b/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\273\204\350\211\262@3x.png" deleted file mode 100644 index 680c826..0000000 Binary files "a/MoblieCQUPT_iOS/Finder/shake/FreshMan_2017/\345\233\276\346\240\207/\351\273\204\350\211\262@3x.png" and /dev/null differ