add
|
|
@ -23,7 +23,6 @@
|
||||||
8338F6B12142182200B4780B /* MaskTime.png in Resources */ = {isa = PBXBuildFile; fileRef = 8338F6B02142182100B4780B /* MaskTime.png */; };
|
8338F6B12142182200B4780B /* MaskTime.png in Resources */ = {isa = PBXBuildFile; fileRef = 8338F6B02142182100B4780B /* MaskTime.png */; };
|
||||||
8338F6B92142504E00B4780B /* LXCustomSwith.m in Sources */ = {isa = PBXBuildFile; fileRef = 8338F6B82142504E00B4780B /* LXCustomSwith.m */; };
|
8338F6B92142504E00B4780B /* LXCustomSwith.m in Sources */ = {isa = PBXBuildFile; fileRef = 8338F6B82142504E00B4780B /* LXCustomSwith.m */; };
|
||||||
833DA7762122A62000A5C614 /* GiGaMaskTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DA7752122A62000A5C614 /* GiGaMaskTaskViewController.m */; };
|
833DA7762122A62000A5C614 /* GiGaMaskTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DA7752122A62000A5C614 /* GiGaMaskTaskViewController.m */; };
|
||||||
833DE8E42150169F009D4329 /* city.json in Resources */ = {isa = PBXBuildFile; fileRef = 833DE8E22150169F009D4329 /* city.json */; };
|
|
||||||
833DE8E52150169F009D4329 /* JYAddressPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DE8E32150169F009D4329 /* JYAddressPicker.m */; };
|
833DE8E52150169F009D4329 /* JYAddressPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DE8E32150169F009D4329 /* JYAddressPicker.m */; };
|
||||||
8340BF9E213E3846008F22E4 /* SHineLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BF9D213E3846008F22E4 /* SHineLabel.m */; };
|
8340BF9E213E3846008F22E4 /* SHineLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BF9D213E3846008F22E4 /* SHineLabel.m */; };
|
||||||
8340BFA2213E60DD008F22E4 /* GIGAMBHUDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BFA1213E60DD008F22E4 /* GIGAMBHUDHelper.m */; };
|
8340BFA2213E60DD008F22E4 /* GIGAMBHUDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BFA1213E60DD008F22E4 /* GIGAMBHUDHelper.m */; };
|
||||||
|
|
@ -118,6 +117,11 @@
|
||||||
838388DA2130046D00D14C53 /* emojizone.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 838388D92130046D00D14C53 /* emojizone.mp4 */; };
|
838388DA2130046D00D14C53 /* emojizone.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 838388D92130046D00D14C53 /* emojizone.mp4 */; };
|
||||||
8384643E214A484400F12B33 /* MaskTestResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384643D214A484400F12B33 /* MaskTestResult.m */; };
|
8384643E214A484400F12B33 /* MaskTestResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384643D214A484400F12B33 /* MaskTestResult.m */; };
|
||||||
83846441214A4BFF00F12B33 /* MaskTestResultVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 83846440214A4BFF00F12B33 /* MaskTestResultVC.m */; };
|
83846441214A4BFF00F12B33 /* MaskTestResultVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 83846440214A4BFF00F12B33 /* MaskTestResultVC.m */; };
|
||||||
|
8384F0E821533528002C19F0 /* MaskResultPercentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384F0E721533528002C19F0 /* MaskResultPercentCell.m */; };
|
||||||
|
8384F0EB21533542002C19F0 /* MaskResultMinViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384F0EA21533542002C19F0 /* MaskResultMinViewCell.m */; };
|
||||||
|
8384F0EE2153355A002C19F0 /* MaskResultShareViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384F0ED2153355A002C19F0 /* MaskResultShareViewCell.m */; };
|
||||||
|
8384F0F121538146002C19F0 /* MaskResultCandView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384F0F021538146002C19F0 /* MaskResultCandView.m */; };
|
||||||
|
8384F0F52153A9C3002C19F0 /* city.json in Resources */ = {isa = PBXBuildFile; fileRef = 8384F0F42153A9C3002C19F0 /* city.json */; };
|
||||||
838500DC2137F3F7003514A3 /* GiGaAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 838500DB2137F3F7003514A3 /* GiGaAttributedLabel.m */; };
|
838500DC2137F3F7003514A3 /* GiGaAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 838500DB2137F3F7003514A3 /* GiGaAttributedLabel.m */; };
|
||||||
838762D3214B9D120039D241 /* GIGaUserInfoAvatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 838762D1214B9D120039D241 /* GIGaUserInfoAvatorCell.m */; };
|
838762D3214B9D120039D241 /* GIGaUserInfoAvatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 838762D1214B9D120039D241 /* GIGaUserInfoAvatorCell.m */; };
|
||||||
838762D4214B9D120039D241 /* GIGaUserInfoAvatorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 838762D2214B9D120039D241 /* GIGaUserInfoAvatorCell.xib */; };
|
838762D4214B9D120039D241 /* GIGaUserInfoAvatorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 838762D2214B9D120039D241 /* GIGaUserInfoAvatorCell.xib */; };
|
||||||
|
|
@ -222,7 +226,6 @@
|
||||||
833DA7742122A62000A5C614 /* GiGaMaskTaskViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaMaskTaskViewController.h; sourceTree = "<group>"; };
|
833DA7742122A62000A5C614 /* GiGaMaskTaskViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaMaskTaskViewController.h; sourceTree = "<group>"; };
|
||||||
833DA7752122A62000A5C614 /* GiGaMaskTaskViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaMaskTaskViewController.m; sourceTree = "<group>"; };
|
833DA7752122A62000A5C614 /* GiGaMaskTaskViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaMaskTaskViewController.m; sourceTree = "<group>"; };
|
||||||
833DE8E12150169F009D4329 /* JYAddressPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JYAddressPicker.h; sourceTree = "<group>"; };
|
833DE8E12150169F009D4329 /* JYAddressPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JYAddressPicker.h; sourceTree = "<group>"; };
|
||||||
833DE8E22150169F009D4329 /* city.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = city.json; sourceTree = "<group>"; };
|
|
||||||
833DE8E32150169F009D4329 /* JYAddressPicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JYAddressPicker.m; sourceTree = "<group>"; };
|
833DE8E32150169F009D4329 /* JYAddressPicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JYAddressPicker.m; sourceTree = "<group>"; };
|
||||||
8340BF9C213E3846008F22E4 /* SHineLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SHineLabel.h; sourceTree = "<group>"; };
|
8340BF9C213E3846008F22E4 /* SHineLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SHineLabel.h; sourceTree = "<group>"; };
|
||||||
8340BF9D213E3846008F22E4 /* SHineLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SHineLabel.m; sourceTree = "<group>"; };
|
8340BF9D213E3846008F22E4 /* SHineLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SHineLabel.m; sourceTree = "<group>"; };
|
||||||
|
|
@ -389,6 +392,15 @@
|
||||||
8384643D214A484400F12B33 /* MaskTestResult.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskTestResult.m; sourceTree = "<group>"; };
|
8384643D214A484400F12B33 /* MaskTestResult.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskTestResult.m; sourceTree = "<group>"; };
|
||||||
8384643F214A4BFF00F12B33 /* MaskTestResultVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MaskTestResultVC.h; sourceTree = "<group>"; };
|
8384643F214A4BFF00F12B33 /* MaskTestResultVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MaskTestResultVC.h; sourceTree = "<group>"; };
|
||||||
83846440214A4BFF00F12B33 /* MaskTestResultVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskTestResultVC.m; sourceTree = "<group>"; };
|
83846440214A4BFF00F12B33 /* MaskTestResultVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskTestResultVC.m; sourceTree = "<group>"; };
|
||||||
|
8384F0E621533528002C19F0 /* MaskResultPercentCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MaskResultPercentCell.h; sourceTree = "<group>"; };
|
||||||
|
8384F0E721533528002C19F0 /* MaskResultPercentCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskResultPercentCell.m; sourceTree = "<group>"; };
|
||||||
|
8384F0E921533542002C19F0 /* MaskResultMinViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MaskResultMinViewCell.h; sourceTree = "<group>"; };
|
||||||
|
8384F0EA21533542002C19F0 /* MaskResultMinViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskResultMinViewCell.m; sourceTree = "<group>"; };
|
||||||
|
8384F0EC2153355A002C19F0 /* MaskResultShareViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MaskResultShareViewCell.h; sourceTree = "<group>"; };
|
||||||
|
8384F0ED2153355A002C19F0 /* MaskResultShareViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskResultShareViewCell.m; sourceTree = "<group>"; };
|
||||||
|
8384F0EF21538146002C19F0 /* MaskResultCandView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MaskResultCandView.h; sourceTree = "<group>"; };
|
||||||
|
8384F0F021538146002C19F0 /* MaskResultCandView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskResultCandView.m; sourceTree = "<group>"; };
|
||||||
|
8384F0F42153A9C3002C19F0 /* city.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = city.json; sourceTree = "<group>"; };
|
||||||
838500DA2137F3F7003514A3 /* GiGaAttributedLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaAttributedLabel.h; sourceTree = "<group>"; };
|
838500DA2137F3F7003514A3 /* GiGaAttributedLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaAttributedLabel.h; sourceTree = "<group>"; };
|
||||||
838500DB2137F3F7003514A3 /* GiGaAttributedLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaAttributedLabel.m; sourceTree = "<group>"; };
|
838500DB2137F3F7003514A3 /* GiGaAttributedLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaAttributedLabel.m; sourceTree = "<group>"; };
|
||||||
838762D0214B9D120039D241 /* GIGaUserInfoAvatorCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaUserInfoAvatorCell.h; sourceTree = "<group>"; };
|
838762D0214B9D120039D241 /* GIGaUserInfoAvatorCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaUserInfoAvatorCell.h; sourceTree = "<group>"; };
|
||||||
|
|
@ -570,8 +582,8 @@
|
||||||
833DE8E02150169F009D4329 /* JYAddressPicker */ = {
|
833DE8E02150169F009D4329 /* JYAddressPicker */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
8384F0F42153A9C3002C19F0 /* city.json */,
|
||||||
833DE8E12150169F009D4329 /* JYAddressPicker.h */,
|
833DE8E12150169F009D4329 /* JYAddressPicker.h */,
|
||||||
833DE8E22150169F009D4329 /* city.json */,
|
|
||||||
833DE8E32150169F009D4329 /* JYAddressPicker.m */,
|
833DE8E32150169F009D4329 /* JYAddressPicker.m */,
|
||||||
);
|
);
|
||||||
name = JYAddressPicker;
|
name = JYAddressPicker;
|
||||||
|
|
@ -1087,6 +1099,7 @@
|
||||||
83835BC0212E66A1001480F2 /* View */ = {
|
83835BC0212E66A1001480F2 /* View */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
8384F0E5215334D1002C19F0 /* MaskResultViews */,
|
||||||
83BC8A812148BE8A00820437 /* NYSliderPopover */,
|
83BC8A812148BE8A00820437 /* NYSliderPopover */,
|
||||||
83835BC8212E8045001480F2 /* GIGAQuetionView.h */,
|
83835BC8212E8045001480F2 /* GIGAQuetionView.h */,
|
||||||
83835BC9212E8045001480F2 /* GIGAQuetionView.m */,
|
83835BC9212E8045001480F2 /* GIGAQuetionView.m */,
|
||||||
|
|
@ -1147,6 +1160,21 @@
|
||||||
path = AlertView;
|
path = AlertView;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
8384F0E5215334D1002C19F0 /* MaskResultViews */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
8384F0E621533528002C19F0 /* MaskResultPercentCell.h */,
|
||||||
|
8384F0E721533528002C19F0 /* MaskResultPercentCell.m */,
|
||||||
|
8384F0E921533542002C19F0 /* MaskResultMinViewCell.h */,
|
||||||
|
8384F0EA21533542002C19F0 /* MaskResultMinViewCell.m */,
|
||||||
|
8384F0EC2153355A002C19F0 /* MaskResultShareViewCell.h */,
|
||||||
|
8384F0ED2153355A002C19F0 /* MaskResultShareViewCell.m */,
|
||||||
|
8384F0EF21538146002C19F0 /* MaskResultCandView.h */,
|
||||||
|
8384F0F021538146002C19F0 /* MaskResultCandView.m */,
|
||||||
|
);
|
||||||
|
path = MaskResultViews;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
838762CF214B9CAA0039D241 /* userInfoView */ = {
|
838762CF214B9CAA0039D241 /* userInfoView */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
|
@ -1434,7 +1462,6 @@
|
||||||
isa = PBXResourcesBuildPhase;
|
isa = PBXResourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
833DE8E42150169F009D4329 /* city.json in Resources */,
|
|
||||||
83346AC6212BBC8C0054D597 /* GiGaRegistViewController.xib in Resources */,
|
83346AC6212BBC8C0054D597 /* GiGaRegistViewController.xib in Resources */,
|
||||||
8351474C21523B7400B25A88 /* GIGaUserChangeMobleCell.xib in Resources */,
|
8351474C21523B7400B25A88 /* GIGaUserChangeMobleCell.xib in Resources */,
|
||||||
838762DE214B9F140039D241 /* GIGaUserWeChatViewCell.xib in Resources */,
|
838762DE214B9F140039D241 /* GIGaUserWeChatViewCell.xib in Resources */,
|
||||||
|
|
@ -1453,6 +1480,7 @@
|
||||||
838762D9214B9EF80039D241 /* GIGaUserIDViewCell.xib in Resources */,
|
838762D9214B9EF80039D241 /* GIGaUserIDViewCell.xib in Resources */,
|
||||||
838762E8214B9FA60039D241 /* GIGaUserCityViewCell.xib in Resources */,
|
838762E8214B9FA60039D241 /* GIGaUserCityViewCell.xib in Resources */,
|
||||||
8342FD8B2151095100D141F4 /* AppVersionLogoCell.xib in Resources */,
|
8342FD8B2151095100D141F4 /* AppVersionLogoCell.xib in Resources */,
|
||||||
|
8384F0F52153A9C3002C19F0 /* city.json in Resources */,
|
||||||
83BFAE68213CCF10004EF801 /* GiGaMineUserViewCell.xib in Resources */,
|
83BFAE68213CCF10004EF801 /* GiGaMineUserViewCell.xib in Resources */,
|
||||||
8351474221521C2A00B25A88 /* GIGaChangePassVC.xib in Resources */,
|
8351474221521C2A00B25A88 /* GIGaChangePassVC.xib in Resources */,
|
||||||
8340BFA9213E65CA008F22E4 /* GIGACommonLocalizabe.strings in Resources */,
|
8340BFA9213E65CA008F22E4 /* GIGACommonLocalizabe.strings in Resources */,
|
||||||
|
|
@ -1592,12 +1620,14 @@
|
||||||
8357ADC92123BFCA000816F2 /* GiGaUserManager.m in Sources */,
|
8357ADC92123BFCA000816F2 /* GiGaUserManager.m in Sources */,
|
||||||
8390116F214E20B2004CA790 /* LYSDatePickerViewController.m in Sources */,
|
8390116F214E20B2004CA790 /* LYSDatePickerViewController.m in Sources */,
|
||||||
8351473C215215C500B25A88 /* GiGAUserInfoCell.m in Sources */,
|
8351473C215215C500B25A88 /* GiGAUserInfoCell.m in Sources */,
|
||||||
|
8384F0E821533528002C19F0 /* MaskResultPercentCell.m in Sources */,
|
||||||
83835BB3212E50ED001480F2 /* ActiveMesagelistVC.m in Sources */,
|
83835BB3212E50ED001480F2 /* ActiveMesagelistVC.m in Sources */,
|
||||||
83835BC3212E677C001480F2 /* GiGaQuestionVC.m in Sources */,
|
83835BC3212E677C001480F2 /* GiGaQuestionVC.m in Sources */,
|
||||||
83A2271F212AC8C100B3E75C /* GiGaUserLoginVC.m in Sources */,
|
83A2271F212AC8C100B3E75C /* GiGaUserLoginVC.m in Sources */,
|
||||||
83901177214E20B2004CA790 /* LYSDatePickerTypeTimeDelegate.m in Sources */,
|
83901177214E20B2004CA790 /* LYSDatePickerTypeTimeDelegate.m in Sources */,
|
||||||
83346ACE212BD7830054D597 /* GiGaWebViewController.m in Sources */,
|
83346ACE212BD7830054D597 /* GiGaWebViewController.m in Sources */,
|
||||||
8357ADD82124027D000816F2 /* GiGaUserDefault.m in Sources */,
|
8357ADD82124027D000816F2 /* GiGaUserDefault.m in Sources */,
|
||||||
|
8384F0F121538146002C19F0 /* MaskResultCandView.m in Sources */,
|
||||||
83835BB6212E5174001480F2 /* GiGaServiceViewController.m in Sources */,
|
83835BB6212E5174001480F2 /* GiGaServiceViewController.m in Sources */,
|
||||||
835147352152003700B25A88 /* GiGaFeedBackViewController.m in Sources */,
|
835147352152003700B25A88 /* GiGaFeedBackViewController.m in Sources */,
|
||||||
8390116E214E20B2004CA790 /* LYSDateLogicViewController.m in Sources */,
|
8390116E214E20B2004CA790 /* LYSDateLogicViewController.m in Sources */,
|
||||||
|
|
@ -1613,6 +1643,7 @@
|
||||||
838388D4212FB7D700D14C53 /* JXTAlertView.m in Sources */,
|
838388D4212FB7D700D14C53 /* JXTAlertView.m in Sources */,
|
||||||
83901178214E20B2004CA790 /* LYSDatePickerItem.m in Sources */,
|
83901178214E20B2004CA790 /* LYSDatePickerItem.m in Sources */,
|
||||||
8342FD8A2151095100D141F4 /* AppVersionLogoCell.m in Sources */,
|
8342FD8A2151095100D141F4 /* AppVersionLogoCell.m in Sources */,
|
||||||
|
8384F0EB21533542002C19F0 /* MaskResultMinViewCell.m in Sources */,
|
||||||
83773FC221479FED0014EE4C /* UIColor+HexColor.m in Sources */,
|
83773FC221479FED0014EE4C /* UIColor+HexColor.m in Sources */,
|
||||||
83901172214E20B2004CA790 /* LYSDatePickerTypeDayAndTimeDelegate.m in Sources */,
|
83901172214E20B2004CA790 /* LYSDatePickerTypeDayAndTimeDelegate.m in Sources */,
|
||||||
835060A9212D38EE007E6220 /* GiGaStartAdView.m in Sources */,
|
835060A9212D38EE007E6220 /* GiGaStartAdView.m in Sources */,
|
||||||
|
|
@ -1622,6 +1653,7 @@
|
||||||
833DA7762122A62000A5C614 /* GiGaMaskTaskViewController.m in Sources */,
|
833DA7762122A62000A5C614 /* GiGaMaskTaskViewController.m in Sources */,
|
||||||
836EE5D7213645E300F0ABB2 /* GiGaBaseAPiRequest.m in Sources */,
|
836EE5D7213645E300F0ABB2 /* GiGaBaseAPiRequest.m in Sources */,
|
||||||
83773FBC214769230014EE4C /* ExercisesModel.m in Sources */,
|
83773FBC214769230014EE4C /* ExercisesModel.m in Sources */,
|
||||||
|
8384F0EE2153355A002C19F0 /* MaskResultShareViewCell.m in Sources */,
|
||||||
83835BD0212E8B9C001480F2 /* GiGaQuestionModel.m in Sources */,
|
83835BD0212E8B9C001480F2 /* GiGaQuestionModel.m in Sources */,
|
||||||
83835BAF212E4FCD001480F2 /* MessageListViewCell.m in Sources */,
|
83835BAF212E4FCD001480F2 /* MessageListViewCell.m in Sources */,
|
||||||
8361B3D9212155C300238FEB /* main.m in Sources */,
|
8361B3D9212155C300238FEB /* main.m in Sources */,
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_line@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 387 B |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_logo@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 3.9 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_moon@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 819 B |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_oillider@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
GIGA/Assets.xcassets/maskTime/result_oillider.imageset/result_oillider@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 734 B |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_percent@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
GIGA/Assets.xcassets/maskTime/result_percent.imageset/result_percent@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 17 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_push@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 861 B |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_time@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 33 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_water@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_waterlider@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
GIGA/Assets.xcassets/maskTime/result_waterlider.imageset/result_waterlider@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_wmz@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 1.9 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_wmzzz@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "result_ylwmz@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "resultback_one@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
GIGA/Assets.xcassets/maskTime/resultback_one.imageset/resultback_one@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "resultback_three@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
GIGA/Assets.xcassets/maskTime/resultback_three.imageset/resultback_three@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 9.0 KiB |
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "resultback_two@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
GIGA/Assets.xcassets/maskTime/resultback_two.imageset/resultback_two@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
|
|
@ -1,9 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"filename" : "usergaurd_uphand@2x.png",
|
"filename" : "usergaurd_uphand@2x.png",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"info" : {
|
"info" : {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"filename" : "userguard_up@2x.png",
|
"filename" : "userguard_up@2x.png",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"info" : {
|
"info" : {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"filename" : "user_changephonewihte@2x.png",
|
"filename" : "user_changephonewihte@2x.png",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"info" : {
|
"info" : {
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@
|
||||||
#import "GiGaUser.h"
|
#import "GiGaUser.h"
|
||||||
#import "GiGaUserManager.h"
|
#import "GiGaUserManager.h"
|
||||||
#import "GiGaBaseAPiRequest.h"
|
#import "GiGaBaseAPiRequest.h"
|
||||||
|
#import "MaskTestResultVC.h"
|
||||||
|
|
||||||
|
|
||||||
@interface GiGaMaskTaskViewController ()<MaskCirCularProGressViewDelegate>
|
@interface GiGaMaskTaskViewController ()<MaskCirCularProGressViewDelegate>
|
||||||
|
|
@ -394,7 +395,6 @@
|
||||||
make.height.and.width.mas_equalTo(136);
|
make.height.and.width.mas_equalTo(136);
|
||||||
make.centerX.mas_equalTo(self.view.mas_centerX);
|
make.centerX.mas_equalTo(self.view.mas_centerX);
|
||||||
}];
|
}];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark 面膜时间背景音乐
|
#pragma mark 面膜时间背景音乐
|
||||||
|
|
@ -488,7 +488,20 @@
|
||||||
|
|
||||||
#pragma mark 开始测试
|
#pragma mark 开始测试
|
||||||
-(void)testBtnAcion:(UIButton *)btn{
|
-(void)testBtnAcion:(UIButton *)btn{
|
||||||
|
NSDictionary *dic = @{
|
||||||
|
@"dryness":@"0.41",
|
||||||
|
@"drynessPercent":@"41%",
|
||||||
|
@"mask":@"",
|
||||||
|
@"minute":@"19",
|
||||||
|
@"oiliness":@"0.59",
|
||||||
|
@"oilinessPercent":@"59%"
|
||||||
|
};
|
||||||
|
MaskTestResult *model =[[MaskTestResult alloc] initWithDictionary:dic error:nil];
|
||||||
|
MaskTestResultVC *resultVC = [[MaskTestResultVC alloc] init];
|
||||||
|
resultVC.model = model;
|
||||||
|
[self.navigationController pushViewController:resultVC animated:YES];
|
||||||
|
|
||||||
|
return;
|
||||||
GiGaQuestionVC *questionVC = [[GiGaQuestionVC alloc] init];
|
GiGaQuestionVC *questionVC = [[GiGaQuestionVC alloc] init];
|
||||||
[self.navigationController pushViewController:questionVC animated:YES];
|
[self.navigationController pushViewController:questionVC animated:YES];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,9 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#import "GiGaBaseViewController.h"
|
#import "GiGaBaseViewController.h"
|
||||||
|
#import "MaskTestResult.h"
|
||||||
|
|
||||||
@interface MaskTestResultVC : GiGaBaseViewController
|
@interface MaskTestResultVC : GiGaBaseViewController
|
||||||
|
@property (nonatomic,strong) MaskTestResult *model;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,9 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#import "MaskTestResultVC.h"
|
#import "MaskTestResultVC.h"
|
||||||
|
#import "MaskResultMinViewCell.h"
|
||||||
|
#import "MaskResultPercentCell.h"
|
||||||
|
#import "MaskResultShareViewCell.h"
|
||||||
|
|
||||||
@interface MaskTestResultVC ()
|
@interface MaskTestResultVC ()
|
||||||
|
|
||||||
|
|
@ -18,21 +21,86 @@
|
||||||
[super viewDidLoad];
|
[super viewDidLoad];
|
||||||
[self addNavTitile:@"测试结果"];
|
[self addNavTitile:@"测试结果"];
|
||||||
// Do any additional setup after loading the view.
|
// Do any additional setup after loading the view.
|
||||||
|
|
||||||
|
[self.view addSubview:self.tableView];
|
||||||
|
self.tableView.delegate = self;
|
||||||
|
self.tableView.dataSource = self;
|
||||||
|
self.tableView.backgroundColor = [UIColor whiteColor];
|
||||||
|
self.tableView.separatorStyle = UITableViewCellSelectionStyleNone;
|
||||||
|
self.tableView.sectionFooterHeight = 0;
|
||||||
|
self.tableView.estimatedSectionFooterHeight= 0;
|
||||||
|
self.tableView.estimatedSectionHeaderHeight = 0;
|
||||||
|
self.tableView.frame = CGRectMake(0,0, KMainW, self.view.bounds.size.height - SAFE_NAV_HEIGHT);
|
||||||
|
[self.tableView registerClass:[MaskResultPercentCell class] forCellReuseIdentifier:@"MaskResultPercentCell"];
|
||||||
|
[self.tableView registerClass:[MaskResultMinViewCell class] forCellReuseIdentifier:@"MaskResultMinViewCell"];
|
||||||
|
[self.tableView registerClass:[MaskResultShareViewCell class] forCellReuseIdentifier:@"MaskResultShareViewCell"];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||||
|
|
||||||
|
if (indexPath.row == 0) {
|
||||||
|
static NSString *cellID = @"MaskResultPercentCell";
|
||||||
|
MaskResultPercentCell *cell =[tableView dequeueReusableCellWithIdentifier:cellID];
|
||||||
|
if (!cell) {
|
||||||
|
cell = [[MaskResultPercentCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:cellID];;
|
||||||
|
}
|
||||||
|
|
||||||
|
[cell loadCellData:self.model];
|
||||||
|
return cell;
|
||||||
|
|
||||||
|
}else if (indexPath.row == 1){
|
||||||
|
static NSString *cellID = @"MaskResultMinViewCell";
|
||||||
|
MaskResultMinViewCell *cell =[tableView dequeueReusableCellWithIdentifier:cellID];
|
||||||
|
if (!cell) {
|
||||||
|
cell = [[MaskResultMinViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:cellID];;
|
||||||
|
}
|
||||||
|
[cell loadMineWith:self.model.minute];
|
||||||
|
return cell;
|
||||||
|
}else if (indexPath.row == 2){
|
||||||
|
static NSString *cellID = @"MaskResultShareViewCell";
|
||||||
|
MaskResultShareViewCell *cell =[tableView dequeueReusableCellWithIdentifier:cellID];
|
||||||
|
if (!cell) {
|
||||||
|
cell = [[MaskResultShareViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:cellID];;
|
||||||
|
}
|
||||||
|
|
||||||
|
[cell kidTitle:self.model.mask];
|
||||||
|
|
||||||
|
return cell;
|
||||||
|
}
|
||||||
|
return nil;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||||
|
CGFloat viewH = KMainH - SAFE_NAV_HEIGHT;
|
||||||
|
CGFloat cellH = viewH / 3 ;
|
||||||
|
return cellH;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
|
||||||
|
return 0.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
|
||||||
|
|
||||||
|
{ return 0.1;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
- (void)didReceiveMemoryWarning {
|
- (void)didReceiveMemoryWarning {
|
||||||
[super didReceiveMemoryWarning];
|
[super didReceiveMemoryWarning];
|
||||||
// Dispose of any resources that can be recreated.
|
// 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
|
@end
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
//
|
||||||
|
// MaskResultCandView.h
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
|
@interface MaskResultCandView : UIView
|
||||||
|
@property(nonatomic,strong) NSArray *imagesArr;
|
||||||
|
- (instancetype)initWith:(NSArray *)images;
|
||||||
|
@end
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
//
|
||||||
|
// MaskResultCandView.m
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import "MaskResultCandView.h"
|
||||||
|
|
||||||
|
@implementation MaskResultCandView
|
||||||
|
|
||||||
|
- (instancetype)initWith:(NSArray *)images{
|
||||||
|
self = [super init];
|
||||||
|
if (self) {
|
||||||
|
|
||||||
|
self.imagesArr = images;
|
||||||
|
[self creatSubs];
|
||||||
|
}
|
||||||
|
return self;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)creatSubs{
|
||||||
|
|
||||||
|
for (NSInteger i=0; i<self.imagesArr.count; i ++) {
|
||||||
|
UIImageView *image = [[UIImageView alloc] init];
|
||||||
|
image.contentMode = UIViewContentModeScaleAspectFill;
|
||||||
|
image.image = [UIImage imageNamed:self.imagesArr[i]];
|
||||||
|
image.layer.shadowColor = [UIColor blackColor].CGColor;
|
||||||
|
image.layer.shadowOpacity = 0.2;
|
||||||
|
image.layer.shadowOffset = CGSizeMake(0, 1);
|
||||||
|
[self addSubview:image];
|
||||||
|
[image mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.size.mas_equalTo(CGSizeMake(20, 29));
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(i*(8 + 20));
|
||||||
|
make.centerY.mas_equalTo(self.mas_centerY);
|
||||||
|
}];
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)layoutIfNeeded{
|
||||||
|
[super layoutIfNeeded];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)layoutSubviews{
|
||||||
|
[super layoutSubviews];
|
||||||
|
|
||||||
|
//[self creatSubs];
|
||||||
|
}
|
||||||
|
@end
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
//
|
||||||
|
// MaskResultMinViewCell.h
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
|
@interface MaskResultMinViewCell : UITableViewCell
|
||||||
|
-(void)loadMineWith:(NSString *)minute;
|
||||||
|
@property (nonatomic,strong) UILabel *timeLabel;
|
||||||
|
@end
|
||||||
|
|
@ -0,0 +1,146 @@
|
||||||
|
//
|
||||||
|
// MaskResultMinViewCell.m
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import "MaskResultMinViewCell.h"
|
||||||
|
@interface MaskResultMinViewCell()
|
||||||
|
@property(nonatomic,strong) UILabel *twoLabel;
|
||||||
|
@property(nonatomic,strong) UIView *colorView;
|
||||||
|
@end
|
||||||
|
@implementation MaskResultMinViewCell
|
||||||
|
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
|
||||||
|
{
|
||||||
|
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
|
||||||
|
if (self) {
|
||||||
|
[self creatUI];
|
||||||
|
//self.backgroundColor = [UIColor blueColor];
|
||||||
|
self.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||||
|
}
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)creatUI{
|
||||||
|
|
||||||
|
UILabel *twoLabel = [[UILabel alloc] init];
|
||||||
|
twoLabel.text = @"2";
|
||||||
|
twoLabel.textColor = GIGARGB(240, 147, 147, 0.1);
|
||||||
|
twoLabel.alpha = 0.6;
|
||||||
|
twoLabel.font = GIGA_TEXTFONTMEDIUM(200);
|
||||||
|
//oneLabel.backgroundColor = [UIColor redColor];
|
||||||
|
[self addSubview:twoLabel];
|
||||||
|
self.twoLabel = twoLabel;
|
||||||
|
[twoLabel sizeToFit];
|
||||||
|
|
||||||
|
[twoLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(-40);
|
||||||
|
//纯数字上下有留白
|
||||||
|
make.size.mas_equalTo(CGSizeMake(twoLabel.frame.size.width, 145));
|
||||||
|
make.bottom.mas_equalTo(self.mas_bottom);
|
||||||
|
}];
|
||||||
|
|
||||||
|
UILabel *jianyiLabel = [[UILabel alloc] init];
|
||||||
|
//jianyiLabel.backgroundColor = [UIColor redColor];
|
||||||
|
jianyiLabel.text = @"建议敷面膜时间";
|
||||||
|
jianyiLabel.textColor = [UIColor blackColor];
|
||||||
|
jianyiLabel.font = GIGA_TEXTFONTBOLD(24);
|
||||||
|
[self addSubview:jianyiLabel];
|
||||||
|
[jianyiLabel sizeToFit];
|
||||||
|
|
||||||
|
[jianyiLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(40);
|
||||||
|
make.top.mas_equalTo(self.mas_top).offset(36);
|
||||||
|
|
||||||
|
}];
|
||||||
|
//时间⌚️
|
||||||
|
UILabel *timeLabel = [[UILabel alloc] init];
|
||||||
|
timeLabel.textColor = [UIColor blackColor];
|
||||||
|
timeLabel.font = GIGA_TEXTFONTBOLD(35);
|
||||||
|
timeLabel.text = @"17分钟";
|
||||||
|
self.timeLabel = timeLabel;
|
||||||
|
[self addSubview:timeLabel];
|
||||||
|
[timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(73);
|
||||||
|
make.top.mas_equalTo(jianyiLabel.mas_bottom).offset(20);
|
||||||
|
}];
|
||||||
|
|
||||||
|
//左侧红色梯形区域
|
||||||
|
|
||||||
|
UIView *colorView = [[UIView alloc] init];
|
||||||
|
[self addSubview:colorView];
|
||||||
|
self.colorView = colorView;
|
||||||
|
[colorView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.width.mas_equalTo(KMainW - 82);
|
||||||
|
make.height.mas_equalTo(self.mas_height);
|
||||||
|
make.centerY.mas_equalTo(self.mas_centerY);
|
||||||
|
make.right.mas_equalTo(self.mas_right);
|
||||||
|
|
||||||
|
}];
|
||||||
|
//沙漏
|
||||||
|
UIImageView *satckImageVIew = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"result_time"]];
|
||||||
|
satckImageVIew.contentMode = UIViewContentModeScaleAspectFit;
|
||||||
|
[self addSubview:satckImageVIew];
|
||||||
|
[satckImageVIew mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.width.mas_equalTo(121);
|
||||||
|
make.height.mas_equalTo(self.mas_height);
|
||||||
|
make.centerY.mas_equalTo(self.mas_centerY);
|
||||||
|
make.right.mas_equalTo(self.mas_right).offset(-30);
|
||||||
|
|
||||||
|
}];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
- (void)layoutSubviews{
|
||||||
|
[super layoutSubviews];
|
||||||
|
[self drawViewInView:self.colorView backColor:GIGA_MAIN_BGCOLOR];
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)drawViewInView:(UIView *)view backColor:(UIColor *)color{
|
||||||
|
|
||||||
|
CGSize finalSize = CGSizeMake(CGRectGetWidth(view.bounds), CGRectGetHeight(view.bounds));
|
||||||
|
|
||||||
|
CAShapeLayer *layer = [CAShapeLayer layer];
|
||||||
|
UIBezierPath *bezier = [UIBezierPath bezierPath];
|
||||||
|
[bezier moveToPoint:CGPointMake(0,finalSize.height)];
|
||||||
|
[bezier addLineToPoint:CGPointMake(finalSize.width, finalSize.height)];
|
||||||
|
[bezier addLineToPoint:CGPointMake(finalSize.width,0)];
|
||||||
|
[bezier addLineToPoint:CGPointMake(finalSize.width*0.424, 0)];
|
||||||
|
[bezier addLineToPoint:CGPointMake(0,finalSize.height)];
|
||||||
|
layer.path = bezier.CGPath;
|
||||||
|
layer.fillColor = color.CGColor;
|
||||||
|
|
||||||
|
layer.shadowPath = bezier.CGPath;
|
||||||
|
layer.shadowColor = [UIColor blackColor].CGColor;
|
||||||
|
layer.shadowOffset = CGSizeMake(1, 1);
|
||||||
|
layer.shadowOpacity = 0.6;
|
||||||
|
[view.layer addSublayer:layer];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)loadMineWith:(NSString *)minute{
|
||||||
|
NSString *time = [NSString stringWithFormat:@"%@分钟",minute];
|
||||||
|
self.timeLabel.text = time;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)laoutSettings{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
- (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
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
//
|
||||||
|
// MaskResultPercentCell.h
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
#import "MaskTestResult.h"
|
||||||
|
|
||||||
|
@interface MaskResultPercentCell : UITableViewCell
|
||||||
|
-(void)loadCellData:(MaskTestResult *)model;
|
||||||
|
@property (nonatomic,strong) UIView *oilView;
|
||||||
|
@property (nonatomic,strong) UILabel *oilLabe;
|
||||||
|
@property (nonatomic,strong) UILabel *waterlabe;
|
||||||
|
@property (nonatomic,strong) UIView *percentColorView;
|
||||||
|
@property (nonatomic) CADisplayLink *displayLink;
|
||||||
|
|
||||||
|
@property (nonatomic) int oilMAXProgress;
|
||||||
|
@property (nonatomic) int waterMAXPorgress;
|
||||||
|
@property (nonatomic) CGFloat oilness;
|
||||||
|
//@property (nonatomic) CGFloat waterness;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
@ -0,0 +1,219 @@
|
||||||
|
//
|
||||||
|
// MaskResultPercentCell.m
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import "MaskResultPercentCell.h"
|
||||||
|
|
||||||
|
@implementation MaskResultPercentCell
|
||||||
|
|
||||||
|
|
||||||
|
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
|
||||||
|
{
|
||||||
|
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
|
||||||
|
if (self) {
|
||||||
|
|
||||||
|
|
||||||
|
[self creatUI];
|
||||||
|
|
||||||
|
self.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||||
|
}
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)creatUI{
|
||||||
|
|
||||||
|
self.backgroundColor = [UIColor whiteColor];
|
||||||
|
|
||||||
|
UIView *percentColorView = [[UIView alloc] init];
|
||||||
|
percentColorView.backgroundColor = GIGARGB(139, 231, 250, 1);
|
||||||
|
[self addSubview:percentColorView];
|
||||||
|
self.percentColorView = percentColorView;
|
||||||
|
|
||||||
|
[percentColorView mas_makeConstraints:^(MASConstraintMaker *make){
|
||||||
|
make.size.mas_equalTo(CGSizeMake(98, 127));
|
||||||
|
make.top.mas_equalTo(self.mas_top).offset(44);
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(60);
|
||||||
|
}];
|
||||||
|
|
||||||
|
[self layoutIfNeeded];
|
||||||
|
//默认0.5
|
||||||
|
CGFloat oilLaerH = percentColorView.frame.size.height * 0.5;
|
||||||
|
UIView *oilView= [[UIView alloc] init];
|
||||||
|
oilView.backgroundColor = GIGARGB(255, 191, 128, 1);
|
||||||
|
oilView.frame = CGRectMake(0,0,percentColorView.frame.size.width, 0);
|
||||||
|
self.oilView = oilView;
|
||||||
|
[percentColorView addSubview:oilView];
|
||||||
|
|
||||||
|
|
||||||
|
UIImageView *topLineimage = [[UIImageView alloc] init];
|
||||||
|
topLineimage.image = [UIImage imageNamed:@"result_line"];
|
||||||
|
[self addSubview:topLineimage];
|
||||||
|
[topLineimage mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(44);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(120, 5.2));
|
||||||
|
make.top.mas_equalTo(21);
|
||||||
|
}];
|
||||||
|
UIImageView *shalouImage = [[UIImageView alloc] init];
|
||||||
|
shalouImage.image = [UIImage imageNamed:@"result_percent"];
|
||||||
|
[self addSubview:shalouImage];
|
||||||
|
[shalouImage mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.top.mas_equalTo(topLineimage.mas_bottom).offset(7);
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(60);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(98, 149));
|
||||||
|
}];
|
||||||
|
|
||||||
|
UIImageView *bootpmLine = [[UIImageView alloc] init];
|
||||||
|
bootpmLine.image = [UIImage imageNamed:@"result_line"];
|
||||||
|
[self addSubview:bootpmLine];
|
||||||
|
[bootpmLine mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(44);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(120, 5.2));
|
||||||
|
make.top.mas_equalTo(shalouImage.mas_bottom).offset(7);
|
||||||
|
|
||||||
|
}];
|
||||||
|
|
||||||
|
//皮肤水油比
|
||||||
|
UILabel *duibiLabel = [[UILabel alloc] init];
|
||||||
|
duibiLabel.text = @"皮肤水油比";
|
||||||
|
duibiLabel.textColor = GIGARGB(55, 55, 55, 1);
|
||||||
|
duibiLabel.font = GIGA_TEXTFONTBOLD(24);
|
||||||
|
[self addSubview:duibiLabel];
|
||||||
|
[duibiLabel sizeToFit];
|
||||||
|
[duibiLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(topLineimage.mas_right).offset(13);
|
||||||
|
make.top.mas_equalTo(self.mas_top).offset(12);
|
||||||
|
}];
|
||||||
|
|
||||||
|
UIImageView *oilPercentgaurd =[[UIImageView alloc] init];
|
||||||
|
oilPercentgaurd.image = [UIImage imageNamed:@"result_oillider"];
|
||||||
|
[self addSubview:oilPercentgaurd];
|
||||||
|
[oilPercentgaurd mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(shalouImage.mas_right).offset(-2);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(27,17));
|
||||||
|
make.top.mas_equalTo(duibiLabel.mas_bottom).mas_equalTo(30);
|
||||||
|
}];
|
||||||
|
|
||||||
|
//oil percent
|
||||||
|
UILabel *oilLabe = [[UILabel alloc]init];
|
||||||
|
oilLabe.text = @"50%";
|
||||||
|
oilLabe.textColor = GIGARGB(255, 191, 128, 1);
|
||||||
|
oilLabe.font = GIGA_TEXTFONTMEDIUM(36);
|
||||||
|
[self addSubview:oilLabe];
|
||||||
|
[oilLabe sizeToFit];
|
||||||
|
self.oilLabe = oilLabe;
|
||||||
|
[oilLabe mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(oilPercentgaurd.mas_right).offset(0);
|
||||||
|
make.bottom.mas_equalTo(oilPercentgaurd.mas_top).offset(19);
|
||||||
|
}];
|
||||||
|
|
||||||
|
UIImageView *watergaurd = [[UIImageView alloc] init];
|
||||||
|
watergaurd.image = [UIImage imageNamed:@"result_waterlider"];
|
||||||
|
[self addSubview:watergaurd];
|
||||||
|
[watergaurd mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(shalouImage.mas_right).offset(2);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(42,19));
|
||||||
|
make.bottom.mas_equalTo(shalouImage.mas_bottom).mas_equalTo(-24);
|
||||||
|
}];
|
||||||
|
|
||||||
|
UILabel *waterlabe = [[UILabel alloc] init];
|
||||||
|
waterlabe.text = @"50%";
|
||||||
|
waterlabe.textColor = GIGARGB(139, 231, 250, 1);
|
||||||
|
waterlabe.font = GIGA_TEXTFONTMEDIUM(36);
|
||||||
|
[waterlabe sizeToFit];
|
||||||
|
[self addSubview:waterlabe];
|
||||||
|
self.waterlabe = waterlabe;
|
||||||
|
[waterlabe mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(watergaurd.mas_right).offset(-19);
|
||||||
|
make.bottom.mas_equalTo(watergaurd.mas_top).offset(12);
|
||||||
|
}];
|
||||||
|
|
||||||
|
UILabel *oneLabel = [[UILabel alloc] init];
|
||||||
|
oneLabel.text = @"1";
|
||||||
|
oneLabel.textColor = GIGARGB(240, 147, 147, 0.1);
|
||||||
|
oneLabel.alpha = 0.6;
|
||||||
|
oneLabel.font = GIGA_TEXTFONTMEDIUM(200);
|
||||||
|
[self addSubview:oneLabel];
|
||||||
|
[oneLabel sizeToFit];
|
||||||
|
[oneLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.centerY.mas_equalTo(self.mas_centerY);
|
||||||
|
make.right.mas_equalTo(self.mas_right).offset(-26);
|
||||||
|
}];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)labProgresAction{
|
||||||
|
|
||||||
|
CALayer *presentLayer = self.oilView.layer.presentationLayer;
|
||||||
|
[self.oilView setNeedsDisplay];
|
||||||
|
|
||||||
|
CGFloat percent = CGRectGetHeight(presentLayer.frame) / self.percentColorView.frame.size.height*self.oilness;
|
||||||
|
//NSLog(@"%.2f",CGRectGetHeight(presentLayer.frame));
|
||||||
|
|
||||||
|
CGFloat curentOilprogress = percent * self.oilMAXProgress;
|
||||||
|
|
||||||
|
int oilInt = (int) curentOilprogress;
|
||||||
|
//NSLog(@"%d",oilInt);
|
||||||
|
self.oilLabe.text = [NSString stringWithFormat:@"%d%@",oilInt,@"%"];
|
||||||
|
|
||||||
|
|
||||||
|
CGFloat waterpercent = CGRectGetHeight(presentLayer.frame) / self.percentColorView.frame.size.height*(1-self.oilness);
|
||||||
|
CGFloat curentWaterprogress = waterpercent * self.waterMAXPorgress;
|
||||||
|
int waterInt = (int)curentWaterprogress;
|
||||||
|
self.waterlabe.text = [NSString stringWithFormat:@"%d%@",waterInt,@"%"];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)awakeFromNib {
|
||||||
|
[super awakeFromNib];
|
||||||
|
// Initialization code
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)layoutSubviews{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)loadCellData:(MaskTestResult *)model
|
||||||
|
{
|
||||||
|
self.oilness = [model.oiliness floatValue] ;
|
||||||
|
self.oilMAXProgress = [model.oiliness floatValue] *100 ;
|
||||||
|
self.waterMAXPorgress = 100 - self.oilMAXProgress;
|
||||||
|
self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(labProgresAction)];
|
||||||
|
[self.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
|
||||||
|
|
||||||
|
NSTimeInterval durition = 1.0;
|
||||||
|
|
||||||
|
if (!model.oiliness || [model.oiliness isEqualToString:@""] || [model.oiliness isKindOfClass:[NSNull class]]) {
|
||||||
|
model.oiliness = @"0.5";
|
||||||
|
}
|
||||||
|
|
||||||
|
CGFloat oil = [model.oiliness floatValue];
|
||||||
|
[UIView setAnimationDelegate:self];
|
||||||
|
[UIView animateWithDuration:durition animations:^{
|
||||||
|
|
||||||
|
self.oilView.frame = CGRectMake(0, 0, self.percentColorView.frame.size.width, self.percentColorView.frame.size.height * oil);
|
||||||
|
} completion:^(BOOL finished) {
|
||||||
|
[self.displayLink invalidate];
|
||||||
|
self.displayLink = nil;
|
||||||
|
self.oilLabe.text = model.oilinessPercent;
|
||||||
|
self.waterlabe.text = model.drynessPercent;
|
||||||
|
|
||||||
|
|
||||||
|
}];
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
|
||||||
|
[super setSelected:selected animated:animated];
|
||||||
|
|
||||||
|
// Configure the view for the selected state
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
//
|
||||||
|
// MaskResultShareViewCell.h
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
|
@interface MaskResultShareViewCell : UITableViewCell
|
||||||
|
@property (nonatomic,strong) UIButton *shareBtn;
|
||||||
|
-(void)kidTitle:(NSString *)title;
|
||||||
|
@property (nonatomic,strong) UILabel *candLabe;
|
||||||
|
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
@ -0,0 +1,140 @@
|
||||||
|
//
|
||||||
|
// MaskResultShareViewCell.m
|
||||||
|
// GIGA
|
||||||
|
//
|
||||||
|
// Created by lianxiang on 2018/9/20.
|
||||||
|
// Copyright © 2018年 com.giga.ios. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import "MaskResultShareViewCell.h"
|
||||||
|
#import "MaskResultCandView.h"
|
||||||
|
|
||||||
|
@implementation MaskResultShareViewCell
|
||||||
|
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
|
||||||
|
{
|
||||||
|
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
|
||||||
|
if (self) {
|
||||||
|
[self creatUI];
|
||||||
|
//self.backgroundColor = [UIColor blueColor];
|
||||||
|
self.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||||
|
}
|
||||||
|
return self;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)creatUI{
|
||||||
|
UILabel *shiheLabe = [[UILabel alloc] init];
|
||||||
|
shiheLabe.text = @"适合您的面膜是:";
|
||||||
|
shiheLabe.textColor = [UIColor blackColor];
|
||||||
|
shiheLabe.font = GIGA_TEXTFONTMEDIUM(18);
|
||||||
|
[self addSubview:shiheLabe];
|
||||||
|
[shiheLabe sizeToFit];
|
||||||
|
[shiheLabe mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(25);
|
||||||
|
make.top.mas_equalTo(self.mas_top).offset(40);
|
||||||
|
|
||||||
|
}];
|
||||||
|
|
||||||
|
UILabel *candLabe = [[UILabel alloc] init];
|
||||||
|
candLabe.textColor = [UIColor blackColor];
|
||||||
|
candLabe.text = @"全效型";
|
||||||
|
candLabe.font = GIGA_TEXTFONTBOLD(30);
|
||||||
|
self.candLabe = candLabe;
|
||||||
|
[self addSubview:candLabe];
|
||||||
|
[candLabe sizeToFit];
|
||||||
|
[candLabe mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(shiheLabe.mas_right);
|
||||||
|
make.top.mas_equalTo(self.mas_top).offset(30);
|
||||||
|
}];
|
||||||
|
//小图标
|
||||||
|
NSArray * imagesArr = @[@"result_water",@"result_moon",@"result_push"];
|
||||||
|
MaskResultCandView *imagsBackView = [[MaskResultCandView alloc] initWith:imagesArr];
|
||||||
|
[self addSubview:imagsBackView];
|
||||||
|
|
||||||
|
[imagsBackView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(candLabe.mas_right).offset(5);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(68, 30));
|
||||||
|
make.centerY.mas_equalTo(shiheLabe.mas_centerY);
|
||||||
|
}];
|
||||||
|
|
||||||
|
//shareBtn
|
||||||
|
UIButton *shareBtn = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||||
|
shareBtn.layer.masksToBounds = YES;
|
||||||
|
shareBtn.layer.cornerRadius = 21;
|
||||||
|
shareBtn.backgroundColor = GIGARGB(181, 14, 14, 1);
|
||||||
|
|
||||||
|
[self addSubview:shareBtn];
|
||||||
|
self.shareBtn = shareBtn;
|
||||||
|
[shareBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.size.mas_equalTo(CGSizeMake(150, 42));
|
||||||
|
make.top.mas_equalTo(imagsBackView.mas_bottom).offset(30);
|
||||||
|
make.centerX.mas_equalTo(self.mas_centerX);
|
||||||
|
|
||||||
|
}];
|
||||||
|
NSAttributedString *titl = [GiGaHelper stringWithText:@"分享页面" textColor:[UIColor whiteColor] textFont:GIGA_TEXTFONTBOLD(20) leterSpace:0];
|
||||||
|
[shareBtn setAttributedTitle:titl forState:UIControlStateNormal];
|
||||||
|
|
||||||
|
UIImageView *logo = [[UIImageView alloc] init];
|
||||||
|
logo.image = [UIImage imageNamed:@"result_logo"];
|
||||||
|
[self addSubview:logo];
|
||||||
|
[logo mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.left.mas_equalTo(self.mas_left).offset(26);
|
||||||
|
make.size.mas_equalTo(CGSizeMake(36, 36));
|
||||||
|
make.top.mas_equalTo(shareBtn.mas_bottom).offset(7);
|
||||||
|
}];
|
||||||
|
|
||||||
|
UILabel *lastLabe = [[UILabel alloc] init];
|
||||||
|
lastLabe.text = @"让更多的朋友一起加入面膜时间吧!";
|
||||||
|
lastLabe.font = GIGA_TEXTFONTBOLD(12);
|
||||||
|
lastLabe.textColor = GIGARGB(166, 33, 33, 1);
|
||||||
|
[self addSubview:lastLabe];
|
||||||
|
[lastLabe sizeToFit];
|
||||||
|
[lastLabe mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
|
||||||
|
make.centerX.mas_equalTo(self.mas_centerX);
|
||||||
|
make.top.mas_equalTo(shareBtn.mas_bottom).offset(15);
|
||||||
|
}];
|
||||||
|
|
||||||
|
//3
|
||||||
|
UILabel *threeLabel = [[UILabel alloc] init];
|
||||||
|
threeLabel.text = @"3";
|
||||||
|
threeLabel.textColor = GIGARGB(240, 147, 147, 0.1);
|
||||||
|
threeLabel.alpha = 0.6;
|
||||||
|
threeLabel.font = GIGA_TEXTFONTMEDIUM(200);
|
||||||
|
|
||||||
|
[self addSubview:threeLabel];
|
||||||
|
[threeLabel sizeToFit];
|
||||||
|
|
||||||
|
[threeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.right.mas_equalTo(self.mas_right).offset(40);
|
||||||
|
//纯数字上下有留白
|
||||||
|
make.size.mas_equalTo(CGSizeMake(threeLabel.frame.size.width, 145));
|
||||||
|
make.centerY.mas_equalTo(self.mas_centerY);
|
||||||
|
}];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void)kidTitle:(NSString *)title{
|
||||||
|
if (!title || [title isEqualToString:@""] || [title isKindOfClass:[NSNull class]]) {
|
||||||
|
title = @"全效型";
|
||||||
|
}
|
||||||
|
self.candLabe.text = title;
|
||||||
|
|
||||||
|
}
|
||||||
|
-(void)layoutSubviews{
|
||||||
|
[super layoutSubviews];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
- (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
|
||||||