From dc959b8ec0723446f90380e75e643a59c414554f Mon Sep 17 00:00:00 2001 From: lianxiang <13052344590@163.com> Date: Fri, 7 Sep 2018 20:07:55 +0800 Subject: [PATCH] fix --- GIGA.xcodeproj/project.pbxproj | 56 ++- .../login/btn_back.imageset/Contents.json | 4 - .../login/btn_back.imageset/btn_back@2x.png | Bin 1582 -> 1635 bytes .../login/btn_back.imageset/btn_back@3x.png | Bin 2607 -> 2802 bytes .../login/btn_load.imageset/btn_load@2x.png | Bin 2751 -> 0 bytes .../login/btn_load.imageset/btn_load@3x.png | Bin 4698 -> 0 bytes .../Contents.json | 8 +- .../login/btn_login.imageset/btn_login@2x.png | Bin 0 -> 2827 bytes .../login/btn_login.imageset/btn_login@3x.png | Bin 0 -> 4850 bytes .../login/btn_meaasag.imageset/Contents.json | 4 - .../btn_meaasag.imageset/btn_meaasag@2x.png | Bin 1397 -> 1476 bytes .../btn_meaasag.imageset/btn_meaasag@3x.png | Bin 2724 -> 2813 bytes .../btn_moment_back.imageset/Contents.json | 4 - .../btn_moment_back@2x.png | Bin 1016 -> 549 bytes .../btn_moment_back@3x.png | Bin 1520 -> 854 bytes .../login/btn_right.imageset/Contents.json | 7 +- .../login/btn_right.imageset/btn_right.png | Bin 410 -> 0 bytes .../login/btn_right.imageset/btn_right@2x.png | Bin 0 -> 873 bytes .../login/btn_right.imageset/btn_right@3x.png | Bin 0 -> 1342 bytes .../btn_tab_desplay.imageset/Contents.json | 4 - .../btn_tab_desplay@2x.png | Bin 1894 -> 1901 bytes .../btn_tab_desplay@3x.png | Bin 3024 -> 3121 bytes .../btn_tab_notselect.imageset/Contents.json | 4 - .../btn_tab_notselect@2x.png | Bin 1370 -> 1378 bytes .../btn_tab_notselect@3x.png | Bin 2088 -> 2097 bytes .../login/btn_turndown.imageset/Contents.json | 7 +- .../btn_turndown.imageset/btn_turndown.png | Bin 386 -> 0 bytes .../btn_turndown.imageset/btn_turndown@2x.png | Bin 0 -> 814 bytes .../btn_turndown.imageset/btn_turndown@3x.png | Bin 0 -> 1247 bytes .../nav_red_moment.imageset/Contents.json | 18 + .../nav_red_moment@2x.png | Bin 0 -> 2066 bytes .../nav_red_moment@3x.png | Bin 0 -> 4282 bytes .../login/nav_redback.imageset/Contents.json | 18 + .../nav_redback.imageset/nav_redback@2x.png | Bin 0 -> 1111 bytes .../nav_redback.imageset/nav_redback@3x.png | Bin 0 -> 1707 bytes .../maskTime/ic_send.imageset/Contents.json | 18 + .../maskTime/ic_send.imageset/ic_send@2x.png | Bin 0 -> 1784 bytes .../maskTime/ic_send.imageset/ic_send@3x.png | Bin 0 -> 2813 bytes GIGA/Category/UINavigationBar+Custom.m | 2 +- GIGA/Common/BaseVC/GiGaBaseViewController.h | 2 +- GIGA/Common/BaseVC/GiGaBaseViewController.m | 14 +- .../GiGaNavTitileView/GiGaNavTitileView.h | 4 + .../GiGaNavTitileView/GiGaNavTitileView.m | 41 +- GIGA/Common/Source/MaskTime.png | Bin 2535 -> 23930 bytes .../Common/Views/CustomSwitch/LXCustomSwith.h | 33 ++ .../Common/Views/CustomSwitch/LXCustomSwith.m | 403 ++++++++++++++++++ .../GiGaAdDetailViewController.h | 4 +- .../GiGaAdDetailViewController.m | 4 +- .../Controller/GiGaRegistViewController.m | 29 +- .../Controller/GiGaRegistViewController.xib | 4 +- .../LogIn/Controller/GiGaUserLoginVC.m | 3 +- .../LogIn/Controller/GiGaUserLoginVC.xib | 6 +- .../LogIn/Controller/GiGaWebViewController.m | 24 +- .../LogIn/Controller/PassWordResetVC.m | 4 + .../LogIn/Controller/PassWordResetVC.xib | 4 +- .../Mask/Controller/GiGaFlingCommitVC.m | 94 ++-- .../Controller/GiGaMaskTaskViewController.m | 42 +- .../Mask/View/GiGaFlyingCommitInputView.m | 37 +- .../Mask/View/MaskTimeCircularProgressView.m | 4 +- 59 files changed, 758 insertions(+), 152 deletions(-) delete mode 100644 GIGA/Assets.xcassets/login/btn_load.imageset/btn_load@2x.png delete mode 100644 GIGA/Assets.xcassets/login/btn_load.imageset/btn_load@3x.png rename GIGA/Assets.xcassets/login/{btn_load.imageset => btn_login.imageset}/Contents.json (59%) create mode 100644 GIGA/Assets.xcassets/login/btn_login.imageset/btn_login@2x.png create mode 100644 GIGA/Assets.xcassets/login/btn_login.imageset/btn_login@3x.png delete mode 100644 GIGA/Assets.xcassets/login/btn_right.imageset/btn_right.png create mode 100644 GIGA/Assets.xcassets/login/btn_right.imageset/btn_right@2x.png create mode 100644 GIGA/Assets.xcassets/login/btn_right.imageset/btn_right@3x.png delete mode 100644 GIGA/Assets.xcassets/login/btn_turndown.imageset/btn_turndown.png create mode 100644 GIGA/Assets.xcassets/login/btn_turndown.imageset/btn_turndown@2x.png create mode 100644 GIGA/Assets.xcassets/login/btn_turndown.imageset/btn_turndown@3x.png create mode 100644 GIGA/Assets.xcassets/login/nav_red_moment.imageset/Contents.json create mode 100644 GIGA/Assets.xcassets/login/nav_red_moment.imageset/nav_red_moment@2x.png create mode 100644 GIGA/Assets.xcassets/login/nav_red_moment.imageset/nav_red_moment@3x.png create mode 100644 GIGA/Assets.xcassets/login/nav_redback.imageset/Contents.json create mode 100644 GIGA/Assets.xcassets/login/nav_redback.imageset/nav_redback@2x.png create mode 100644 GIGA/Assets.xcassets/login/nav_redback.imageset/nav_redback@3x.png create mode 100644 GIGA/Assets.xcassets/maskTime/ic_send.imageset/Contents.json create mode 100644 GIGA/Assets.xcassets/maskTime/ic_send.imageset/ic_send@2x.png create mode 100644 GIGA/Assets.xcassets/maskTime/ic_send.imageset/ic_send@3x.png create mode 100644 GIGA/Common/Views/CustomSwitch/LXCustomSwith.h create mode 100644 GIGA/Common/Views/CustomSwitch/LXCustomSwith.m diff --git a/GIGA.xcodeproj/project.pbxproj b/GIGA.xcodeproj/project.pbxproj index 3d18081..a2c8d1a 100644 --- a/GIGA.xcodeproj/project.pbxproj +++ b/GIGA.xcodeproj/project.pbxproj @@ -18,6 +18,8 @@ 83346AD1212BF5B70054D597 /* useragreement.html in Resources */ = {isa = PBXBuildFile; fileRef = 83346AD0212BF5B70054D597 /* useragreement.html */; }; 83346AD4212BFF6E0054D597 /* UserGuardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83346AD3212BFF6E0054D597 /* UserGuardViewController.m */; }; 83346AD7212C18F50054D597 /* GiGaAppGaurdVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 83346AD6212C18F50054D597 /* GiGaAppGaurdVC.m */; }; + 8338F6B12142182200B4780B /* MaskTime.png in Resources */ = {isa = PBXBuildFile; fileRef = 8338F6B02142182100B4780B /* MaskTime.png */; }; + 8338F6B92142504E00B4780B /* LXCustomSwith.m in Sources */ = {isa = PBXBuildFile; fileRef = 8338F6B82142504E00B4780B /* LXCustomSwith.m */; }; 833DA7762122A62000A5C614 /* GiGaMaskTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DA7752122A62000A5C614 /* GiGaMaskTaskViewController.m */; }; 8340BF9E213E3846008F22E4 /* SHineLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BF9D213E3846008F22E4 /* SHineLabel.m */; }; 8340BFA2213E60DD008F22E4 /* GIGAMBHUDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BFA1213E60DD008F22E4 /* GIGAMBHUDHelper.m */; }; @@ -84,7 +86,6 @@ 83835BD0212E8B9C001480F2 /* GiGaQuestionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 83835BCF212E8B9C001480F2 /* GiGaQuestionModel.m */; }; 838388C4212F934400D14C53 /* pomodoSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 838388C3212F934400D14C53 /* pomodoSound.m4a */; }; 838388C8212F9C4200D14C53 /* GiGaLocalNotificationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 838388C7212F9C4200D14C53 /* GiGaLocalNotificationManager.m */; }; - 838388CA212FA00200D14C53 /* MaskTime.png in Resources */ = {isa = PBXBuildFile; fileRef = 838388C9212FA00200D14C53 /* MaskTime.png */; }; 838388D3212FB7D700D14C53 /* JXTAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 838388CE212FB7D700D14C53 /* JXTAlertController.m */; }; 838388D4212FB7D700D14C53 /* JXTAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 838388D2212FB7D700D14C53 /* JXTAlertView.m */; }; 838388DA2130046D00D14C53 /* emojizone.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 838388D92130046D00D14C53 /* emojizone.mp4 */; }; @@ -150,6 +151,9 @@ 83346AD3212BFF6E0054D597 /* UserGuardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserGuardViewController.m; sourceTree = ""; }; 83346AD5212C18F50054D597 /* GiGaAppGaurdVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaAppGaurdVC.h; sourceTree = ""; }; 83346AD6212C18F50054D597 /* GiGaAppGaurdVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaAppGaurdVC.m; sourceTree = ""; }; + 8338F6B02142182100B4780B /* MaskTime.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MaskTime.png; sourceTree = ""; }; + 8338F6B72142504E00B4780B /* LXCustomSwith.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCustomSwith.h; sourceTree = ""; }; + 8338F6B82142504E00B4780B /* LXCustomSwith.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXCustomSwith.m; sourceTree = ""; }; 833DA7742122A62000A5C614 /* GiGaMaskTaskViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaMaskTaskViewController.h; sourceTree = ""; }; 833DA7752122A62000A5C614 /* GiGaMaskTaskViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaMaskTaskViewController.m; sourceTree = ""; }; 8340BF9C213E3846008F22E4 /* SHineLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SHineLabel.h; sourceTree = ""; }; @@ -267,7 +271,6 @@ 838388C3212F934400D14C53 /* pomodoSound.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = pomodoSound.m4a; sourceTree = ""; }; 838388C6212F9C4200D14C53 /* GiGaLocalNotificationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaLocalNotificationManager.h; sourceTree = ""; }; 838388C7212F9C4200D14C53 /* GiGaLocalNotificationManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaLocalNotificationManager.m; sourceTree = ""; }; - 838388C9212FA00200D14C53 /* MaskTime.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MaskTime.png; sourceTree = ""; }; 838388CD212FB7D700D14C53 /* JXTAlertController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JXTAlertController.h; sourceTree = ""; }; 838388CE212FB7D700D14C53 /* JXTAlertController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JXTAlertController.m; sourceTree = ""; }; 838388CF212FB7D700D14C53 /* JXTAlertManagerHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JXTAlertManagerHeader.h; sourceTree = ""; }; @@ -374,15 +377,24 @@ 83346AC8212BD4160054D597 /* Source */ = { isa = PBXGroup; children = ( + 8338F6B02142182100B4780B /* MaskTime.png */, 8342D9FC2131150200D16B1D /* 4481.wav */, 838388D92130046D00D14C53 /* emojizone.mp4 */, - 838388C9212FA00200D14C53 /* MaskTime.png */, 838388C3212F934400D14C53 /* pomodoSound.m4a */, 83346AD0212BF5B70054D597 /* useragreement.html */, ); path = Source; sourceTree = ""; }; + 8338F6B62142504E00B4780B /* CustomSwitch */ = { + isa = PBXGroup; + children = ( + 8338F6B72142504E00B4780B /* LXCustomSwith.h */, + 8338F6B82142504E00B4780B /* LXCustomSwith.m */, + ); + path = CustomSwitch; + sourceTree = ""; + }; 8340BF9F213E6080008F22E4 /* GIGAMBHUDHelper */ = { isa = PBXGroup; children = ( @@ -405,6 +417,7 @@ 8340BFAC213E7374008F22E4 /* Views */ = { isa = PBXGroup; children = ( + 8338F6B62142504E00B4780B /* CustomSwitch */, 8340BFAD213E739D008F22E4 /* GiGaNoNetWorkView.h */, 8340BFAE213E739D008F22E4 /* GiGaNoNetWorkView.m */, ); @@ -1106,7 +1119,6 @@ 83BFAE78213CDE91004EF801 /* GiGaSettingsViewCell.xib in Resources */, 83346AC1212BB50A0054D597 /* PassWordResetVC.xib in Resources */, 83346AD1212BF5B70054D597 /* useragreement.html in Resources */, - 838388CA212FA00200D14C53 /* MaskTime.png in Resources */, 83BFAE68213CCF10004EF801 /* GiGaMineUserViewCell.xib in Resources */, 8340BFA9213E65CA008F22E4 /* GIGACommonLocalizabe.strings in Resources */, 83835BA8212E4748001480F2 /* MAssaageCenterCell.xib in Resources */, @@ -1116,6 +1128,7 @@ 8340BFAB213E665D008F22E4 /* GIGAUserLocalizable.strings in Resources */, 8342D9FD2131150200D16B1D /* 4481.wav in Resources */, 83835BB0212E4FCD001480F2 /* MessageListViewCell.xib in Resources */, + 8338F6B12142182200B4780B /* MaskTime.png in Resources */, 83346ACF212BD7830054D597 /* GiGaWebViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1254,6 +1267,7 @@ 8345C13621414D3B00051717 /* NSString+Unicode.m in Sources */, 83835BC7212E7BBF001480F2 /* GiGaNavTitileView.m in Sources */, 8361B4322121832800238FEB /* GiGaBaseViewController.m in Sources */, + 8338F6B92142504E00B4780B /* LXCustomSwith.m in Sources */, 8357ADD32123C7C6000816F2 /* GiGaAPIResult.m in Sources */, 8340BF9E213E3846008F22E4 /* SHineLabel.m in Sources */, 8361B4352121836700238FEB /* GiGaBaseNavViewController.m in Sources */, @@ -1467,7 +1481,10 @@ ); INFOPLIST_FILE = GIGA/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.gigamask.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1494,7 +1511,10 @@ ); INFOPLIST_FILE = GIGA/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.gigamask.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1509,7 +1529,11 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = GIGATests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = lianxiang.GIGATests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1523,7 +1547,11 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = GIGATests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = lianxiang.GIGATests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1536,7 +1564,11 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = GIGAUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = lianxiang.GIGAUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1549,7 +1581,11 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = GIGAUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = lianxiang.GIGAUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/GIGA/Assets.xcassets/login/btn_back.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_back.imageset/Contents.json index 130483e..37bd2b8 100644 --- a/GIGA/Assets.xcassets/login/btn_back.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_back.imageset/Contents.json @@ -1,9 +1,5 @@ { "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, { "idiom" : "universal", "filename" : "btn_back@2x.png", diff --git a/GIGA/Assets.xcassets/login/btn_back.imageset/btn_back@2x.png b/GIGA/Assets.xcassets/login/btn_back.imageset/btn_back@2x.png index 15675b5b5e5471ed8fd78a608d73d568f4fc9ba2..c948e01ac4cec853ccf2f49a361bfa5c1367683e 100644 GIT binary patch delta 1606 zcmV-M2D$mJ4C4%tFnwn-7N zsbU}n6L%S>AZchqlcZyY(2+DLpouB$P+Trebq3r2EbS(Ah@vSr=z zed~MTEbF8@$q|#C#Jk#k``%AaZ+CCsDXW3vIF4HE?jAt>j(>8Tmo3LhL0!sGinWEl zG^(_vR2qE`l~VVHHaC}1I~=d4sCp(XClYVlwmoKB)>%L%L+MZ|qb=*M)_Qs%oBc7= zTnL8(o=+qOEZe>T$kSp7-g=Do4C+;Sw21$@rG=ig>_Q#{0jZ(8by7KW2Pwe zi>39IQ`zjYbbr;V0|77e^z=GAJD&k`j0yqw4<=5b@$K`;uk}eL z^A_~HkC+$-e7l*a)U;}AyZXk)#=7}jw>UzjHki%MR-0TEcrhOT(0_KETTl>%SC^ueb@5~__ggiE zVaHbD@z?e&YXaUL#N0it)a9XE?h8LXi2urEp|kTQU_Zxb6hHl)?nL6vqlTqr>ZEQs zC6JZ4o(AQ|23}lgh zsSm_3cYgybpZ}E$jA3vpmm3$sX4ZhdgP1@r!*cIp`{0h>d?vd%%!=5FxHg9kevxl(hryE}`A}ffPb*N#o`>k`NhKa_7C+ya}MWH2X#?r zC1{sn(v0zRb&CP!vjLA=bAsVekiqi0u(x*|a<8%<28Y8!dtir+Zs;l$i=UL+kRS-rVp2okUD_nG? z3uC=%eHNIg8`<67{+=?@5w^zeP+Dj7umR@nHmoAb`@qgJ6g>Jy!XD$Ext1;#<$rl2 zt+AgOV2Nd~V6Ao~SXp58oQQt*N^D@|qI*a|9DB?g1TKECvcM`WMD85*cp7Xc2}V|2 zQq?_|a+G<4AjFkmF>h92MaNMMgEs#YC>_X@ADFiCNev*{hOnMVR;(e#@pLv>oS5#wptog-d^lTgzw?@Z!x$j@Zp=!vsn3jL_a)(`su&+5;&=! znHP%!EH%8Pm_EXtYZTtC`RW#)pTTRbCHxv#WA&AP0Wf>JKE=_kF#rGn07*qoM6N<$ Ef+qSToB#j- delta 1553 zcmV+s2JZRe46Y22Fns~h9;(nLxmAY1_x2xUE&7WgboUX@Esv?KuAb&0X9DG z@O^J~eSf@rx4V}d%9Cz)Z+GU+@7~RyH{TlR#jG__s~i#|&wq-Q2jOZ&tQ`?C_|WXC z7_*8CoaGmkS&)2T8TYI{&Tudp>WKVWo)BNAQ1>VR_onh;%ng*E7fG-9+%85{q`rknBjUzGoXpVS(IGv zq>PR)Z{O>3k$()hTFIlqv+%{JvY~%)oCWyjGIsxEF^~MK_q!eJkGrM%`w`TC0Y#@# z|E{3Q9DdX(87tJfx#$jDD-{u$IehLxBz@3ckOA|S>?>UF=Dg$c>y>@7Y0uyvcp1Ju z`2Gu@DalWiJJst9Tr0l@#B*?(LsXVzmpLx`3qN#nn1A}&waTNiWoHoW!w5zl=qDs! z{3y;(Jn%~C15|oLD|+Ul92k97%tIS-j(WOpe;$?{p*J1jjIQWVj_OV32Ayo=;NLR1=eg9-aj=8K&kKEawvdULp)pdeJb~Ha zTYuD9Ln3o;qC_SV0Fmd9X$Ocbi^wK}MYqv}=}+(tBSCr+Nr#=(AE+r}!mKN4q4U!LGs+x;i*7ErE#`2y z(Xf@$r}#33U$i9o(Whc}&W#$k=c-y6!ZdpY&bgDHgKYIu*ia+FyhF*8Dt{t{Ij41n z<@$TJ{&_S=Wgm(rn3}8=nEEUwPpXJiUizu4g;12LR1^dQS=uz?R$x}5K1<0{&A!`L zXoW?aG?iUO%X01dEW1Hhxiub`4fjjXuKOROH4Ly` z1Z@J-?xPd?a!KpD!eTUnP;2!Fo(&Ty7A)lo{e}*k_mxPPPv) z_o(&Qxl6Q`1$Y_nA>=Hkz44|;c5vt_%|}Yy8RFJsp^Qz+3NcM015yANkvXXu0mjf De%ACA diff --git a/GIGA/Assets.xcassets/login/btn_back.imageset/btn_back@3x.png b/GIGA/Assets.xcassets/login/btn_back.imageset/btn_back@3x.png index 8125e7460d927fc6c6c9520b39ecd72f0bb015f4..aa04842cc7a468cfcfcd79f26377124aacfe69b1 100644 GIT binary patch delta 2782 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 delta 2586 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 diff --git a/GIGA/Assets.xcassets/login/btn_load.imageset/btn_load@2x.png b/GIGA/Assets.xcassets/login/btn_load.imageset/btn_load@2x.png deleted file mode 100644 index fbcec5ab16e3a55c2ed368166f7222dcfe75012e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2751 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 diff --git a/GIGA/Assets.xcassets/login/btn_load.imageset/btn_load@3x.png b/GIGA/Assets.xcassets/login/btn_load.imageset/btn_load@3x.png deleted file mode 100644 index 8786bc3a8c71aaedf567b1d85e0e1a7970088b28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4698 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 diff --git a/GIGA/Assets.xcassets/login/btn_load.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_login.imageset/Contents.json similarity index 59% rename from GIGA/Assets.xcassets/login/btn_load.imageset/Contents.json rename to GIGA/Assets.xcassets/login/btn_login.imageset/Contents.json index ef3cc84..221145d 100644 --- a/GIGA/Assets.xcassets/login/btn_load.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_login.imageset/Contents.json @@ -2,16 +2,12 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_load@2x.png", + "filename" : "btn_login@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_load@3x.png", + "filename" : "btn_login@3x.png", "scale" : "3x" } ], diff --git a/GIGA/Assets.xcassets/login/btn_login.imageset/btn_login@2x.png b/GIGA/Assets.xcassets/login/btn_login.imageset/btn_login@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..106e21230b942dff6de21c5d11cb864de7844307 GIT binary patch literal 2827 zcmYjT3pmsJ8{c+D#!=&6_LpQ4Ik}WeCb^89REUt{Ivh23m1~yEm`b_i{OK$30eEX|#6fH`Bf{s-8K@Bd{N z{3_Mu<|hBlzxs@!`T1<`0iY8>DdZ5Ex??t3ilwHy{K0skigTz{b+JL z820gw?4*>gr(xhHV*Sv<(%MRBTt^L**QDo%)78*$jA3hA8+v79^(;a+2QNY(5=cCH zMJyJ^DafbN99moJeXXq(h@lo%1l;v&$9cMWMY-4L$|~%y#BV=Oso+6^4NNUCjOiyk zjLJAHJMg}D*5=6^=d3-W%;CsGu2)X@2KN+OmKbO}r7W_pWkLFfAA0yk_P+Z%pr%)F zgcEA#PH?lkZWgyZvq#MLhi1vlZ^L6QAAuB*4UqmHGxAH_%^yCz=NPMwzaW$5xk?O# zt>n`W1TZOH~0IgiolZ;rH4lQwisXEC;Y)8Ck$kWUlbSS27=r% zM??5oS*K4ck#PSsUoA7!660|$FY;dNczxtDeXI48;$%eZ8>T@P*Lh9(I(gcc>shFg zH|2!2c{*Jx?D-%LyGLl3=nval-}6$wvkQwGzh=+iuh?}Q-|&*{GwF2tU@C$pVQGujbF6pNYv`t< zBIevRuHE{JrBI#B0RW-B9h-6EyBsSk2j+Q{Q=v`J|&L0Bz3Is^=3Nylu=wBfXmkLXdXY2I(nNqe5Np04}m1h0hDA)F>9OFM4)pOo|$XRRrjlXwXJ7#ES)_ENV&mFZxEV>&57$W6Wfvw< z1_%E&omF(!6jcmO4u>q7&b!z#K3rB?I_%P(Awyl-tW1u`Oo;)2HzFrSHQIizp#+Yk zZ1?lJd5wj&Q}FxZZ2(Lk@JpIe^x;2lgcuXMvMYxT9_MC~)Ji+_ZGbY&)ZnqT*z2|Z z)nsi<$nwI)Du}9sV|a@xT8~x z7UerBCqPfdg)rl3?^QZ3A2zjA)fD)Nf{%3B+FchTYtOJlh^JsAKJOvZSlt@@fCT~(8|6v+~@ z5Yj}to#Mwkfl9;A&NzrT&t>nDUKm{)wW zqvFM5O8DD7mcT!c)oT|{2Epdk58~F+gt6c_aHsz;CWT zSv`ObAB2F8E85G57-3f}xEnWce!B163jJ_Vbbo_r0DM+%=lZO;8P)$8I;J@p54XHBX_Ut4Dvy+yiP)$``IArSK`!~*bx7j z`(aO4O^9qj2SE_dK4zN9N&RJ?YKLeOp6B>%ldLg;q8mMJJZQ5#3x4>U_YHg z)D3Zia-6~~t4{@j!@LHLsdl3R_q{a&S_n?DBWFL&<4Xo;g)qqd>G98BM2*NV1^wcp zwtbqT$*$l|ht9sI!BKRQ?wn+x*31}{%1CE#(n%IW;@gBq$z*D3Vdu0fH4xUdD1HHl zTWlaW1tt@IlID)M*aicm(ELS4os=WcB{$D8z9zQ`H|R7N|9N1Aw6JOin-G zx`@d9G|KE9OHV89z}kvYzimW%vBdm12oGsY`Q>|}0ykd(H#NHFVk%Zpvma#(cL!=w zBIf(^Wcz({#FkJyewgc}Q*u>}HQ&ZNE54<+SL`F_<)BtNg|IJx5Wo0N;fYDm z*4yDQzt+eH|X5Zlsp5U$w2xFqp3GK_O@(!D}{MNS2|X z+m-B|=n?1atO$*xGdKOZmM=RymoIjC<}&H(9bcy+w`JcD4WTD5*?byyfBNOi(DSmg zj5oVVG|Ux^K|A*^l?51#11q4*doYXv)_i0$$+7BRUL$*NmAo50S=4FD#jZCV?8_k* z*_DY)(G!fgF(qLc2~Pd<(P(;;?4@1*|$WCz#Z literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/btn_login.imageset/btn_login@3x.png b/GIGA/Assets.xcassets/login/btn_login.imageset/btn_login@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d3d586e046d1c39f1fd1afe97d28b4b7da9b8844 GIT binary patch literal 4850 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 I`fAkw0mipN*8l(j literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/btn_meaasag.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_meaasag.imageset/Contents.json index c454cc3..f530c0a 100644 --- a/GIGA/Assets.xcassets/login/btn_meaasag.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_meaasag.imageset/Contents.json @@ -1,9 +1,5 @@ { "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, { "idiom" : "universal", "filename" : "btn_meaasag@2x.png", diff --git a/GIGA/Assets.xcassets/login/btn_meaasag.imageset/btn_meaasag@2x.png b/GIGA/Assets.xcassets/login/btn_meaasag.imageset/btn_meaasag@2x.png index e809918eb9859a79c113d50caafa92d667ec7f6b..cfda3e8d6d7f5728b7c9baddaaf6ccec756e8a0a 100644 GIT binary patch delta 1445 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 diff --git a/GIGA/Assets.xcassets/login/btn_meaasag.imageset/btn_meaasag@3x.png b/GIGA/Assets.xcassets/login/btn_meaasag.imageset/btn_meaasag@3x.png index 55e9d29927b45075c3b67cf1834b2db84a534ebf..5ad9324f5f1ff6243c2619f05b285972973ad91c 100644 GIT binary patch delta 2792 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 diff --git a/GIGA/Assets.xcassets/login/btn_moment_back.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_moment_back.imageset/Contents.json index e67fafe..4a9e8f2 100644 --- a/GIGA/Assets.xcassets/login/btn_moment_back.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_moment_back.imageset/Contents.json @@ -1,9 +1,5 @@ { "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, { "idiom" : "universal", "filename" : "btn_moment_back@2x.png", diff --git a/GIGA/Assets.xcassets/login/btn_moment_back.imageset/btn_moment_back@2x.png b/GIGA/Assets.xcassets/login/btn_moment_back.imageset/btn_moment_back@2x.png index d33febda5eb844ad02bebeadb2dc20002f7284f1..b7ce42ee9e6725aa78bb046b1c9b78d115e73ea5 100644 GIT binary patch delta 511 zcmV2IG`@X zc?%jGR-pdbo@=b+<)z^3b-m=$RTXkiS980%nnt7Ms;a7wp3xiX)rtc!L_a9ixE3Jp zEp(A6<`@sed=cFlNNRr3=!VV^!!@Me%9qAE(XaugnuV`>27lUNFwC0h0NHTR{i_k5 ztw@-{AyZ$1AEIU?tc{^AmoHt`K^RCz7kQ9!Cuvy6nLxtlZ1N&rbI~ul*>3atD%Ghc&Y!B1#4D6P%g)kUq3deBM9)lXxIj(A98m!roR#m>tdP<#|`82p)i?Y`ht9& zG7uLIbJjDaZJU+tgtnPU50$&5I(vZALbDt?!(;}u+-+f?y78}(ulO6^K((};c;bIQ zc49E6f+ui^G002ovPDHLkV1m1` B_1^#h delta 982 zcmV;{11bEa1o#J#FnOtkg!QY@j@a)-}q6c45OT3c=ilRy$`VR;~K(Bf*lq4CucUiKN&2y75m)-8&?r)~& zo8ImfX!h8SjY8rnAiWS`N;DNO8Ji~mvyk!#N2K(o0Pe2(k$*XuC!p~{|BYYa&Pp3H z{}w2OeF~TmX$Xup7H}uthiq!#+Ho8|b>St|<@d5w>FE$jW6WnAn8w?`JS} zUq2udA{n2daJ{8H^B2rH3f(t^&VfBkUtdU>9Ea(b6h8uc&_o#LLz{}e z3ZXPFUxT2A)F8*7 zSCl126(39vi5c{Uo+x@3LLM*`@4#V>$#FsP!{iX+9;K;|ir%GQ0w!aZ$)3q^R`nxN z(DX2c@PC`CcQ0wQU)RVy;RM4Ptt`+;FrKD{oP6dahj>He7^VaL%l%r4TRK^4zNdUr zikrIAYIJ}fQs@p8b1Cmq&Rn7oYr&o>Z@ChxAdTlbx`)5J@?ONq3~5j3E4)Myfda>} z12VHh#8S^?5l7Xk@_X1Zl0wVrK??6D#aN=1&VObUTd~KA-ldQ~_?81sZ9fuo$mJec zs^crCHfWQ?UUkopU#NWJ1hi~8c|$yR92rjDnwOJ-t9)7-kbzJ1^TdFi!8IaNKaojI zZ4&L2FqW~ksFsIpQ(@#uQ|d*NOhfeegYpWKiEA0NLsA}<6Uv9wZfTGy9-);v*~-AW zZ-0_1?6lpa*nRbYmUS|Io4%J!rh>Ab%0&GX)uiPsx7q<2*eHa#ODZToL^BFu2INji z_fck|&d5HvP2&!VJE;<*GHFT}8XXaLMxZQY9~^2<5Xr?^ihv`64u##es(Z8OnxP~y zT?8Nsum8TCO!Wg=v*Iuc%sa@$Vb^_Ot4~L493TT%(Q-Ey&;UKjp9)rZ&EF<3D7+Jv z%DjqH<5y@Q7-WibRFU2M`)m0>La*p8x;=07*qoM6N<$ Eg05uJ5C8xG diff --git a/GIGA/Assets.xcassets/login/btn_moment_back.imageset/btn_moment_back@3x.png b/GIGA/Assets.xcassets/login/btn_moment_back.imageset/btn_moment_back@3x.png index 0c11463c1ed6efc3270afdc99f7566ca30ed557b..ecc96ac978e1c7c19178a3b8f9061f78b81f9dbd 100644 GIT binary patch delta 819 zcmV-31I+yJ3)TjZFnj*oTVKB9umr0&k9QYWtm}E2-RgtIDTS{>e!-U3K$+{nMxV-l`fIsVoMA!5F%M zKA|1dL!GKH0qUY>s2RO#Kp~q%{U+h?@9io;ftf*HTOjrJmVX@-hKTYfdVDd ztR~<>*L_}$T0luWj@AQ7ORFj`Spb!kdcSWWXHL#QgxTdJs}B%em_GLSOOj1%${06EiaFve<{B>;Y-ROoKK zYpEoOWtxX6x?$fvTAOM1ll)}{Ql`0NsiKmS{4mOy<_lv^I3Z61@ExV%EuDv)kXHc6 zndT{DtfqOCD&es2F70khB}se$y&8hFH9zUNU;$K8l7AmT@7w5x@5?mDosee%C^5}J zC*(CCbEbL1n0*#V5|5(CC>OUG;4zIVL-Ly$LYd~ArHXMsSDP51#Ah@&Vq6X-*De?lWz-ITl* zQ6e$*d@)>OYk{bL0V1vrz$H(oz9pRoY{~Qf1|Q0|NEU#BC|N=AE;~lB+Wjb5 zlkzR(MzAv31C)yu26$Ha0<2mf7Llf?RIJnK*?(+kz?N>``1U*lFcs6<{${GI^vPtt z4Y3Hebc^wFxW?8}vHCY{LD{0oLT-7XBk|0T@D^htj?4-=dB~ xge(zk7fL-9G@}>BRMSEzlP#ld^by@coj;j^Q`G#FL7e~q002ovPDHLkV1j@fg|Pqt delta 1490 zcmV;@1ugp42Jj1zFn|#QKa6y9>VRv)&U8O-m6E-<& zqJ|3^U*)TO9JEwG2<3qi-U(7t5UqsnW#9K~xZv?D&1N zj63`2-skKtU9~km{q=PJ_M84sPxm*3W=qcT^I*@7FxCTboPQ7u+KUKnr>5fk$y|wl zQU{pnhAb|FUTz-H6XvB@bPlr@qgjyYlR2Y6Vf~Bj#En>RK2tyfL{8&DljBb@;32>{ zU+E#o8ExFHcSSS%1{~a@1QY|Yn4&ly!WD z+Kb6bYymk3wUD4s(Hib96;gO>=TYZ}7T7Z)n!9|C$j=hJjcCV1D$(R$kS?hWsEFqD znS%_uPSp{+B*oL^R&@2hqO7AaR1Z2cc{%3iMGR}y{jg{Z+=gi12kJU{OLd@D;%4^J ze(iW9vVT}KgXN6JLdcbi$r^u}8!RFke1aA#OEiTbrL269ifF78d-&QrRE@gjL~pTZ z9xhijsy535ojcZnQ-8B)aGk0_S2Sd7;djVam31mGln$CqT)|^eUb{4+!AV{>YMHATP-dEImCX|t`Ju6yU(a4s)~TT(oY$6R zUde#6eC^D$WeQG$LYolX@KL5H*jy;9c{?%0fHEDf%qsVvxT0Cok7)1b{^FqX88O-B z2!9Lay&|HSz>;O%i1d6PG+1u?#J4#F+Z^NL?YYLRbAxsxvi#AYMU&O1?<5S%+{w3F z4e5%;c#>zD*L~O3Ju70;z3BeIkJ?R$#Xqh)Sx$$UF`8p&wo?He(?G2NQb%}rJf^8r z7ZZ!g48wNzHoKTIGgESW2XFE1WZ+C$u79tH`0>=f5v$k!o@)yFJR3?L_>QxWpQUZe zj){JR5gx4fvosr2=?dk|akNYFEu8q@=}6We*rK3ha&{NhX-adG@N@3LASi+_Vk zkM_}9`Bsa_G;jI56ft=H9?)BUX`ljI>U(NK7k2_0i+_doHWAq|IaMSU8Nbiki6<2H zii=D4sMp0gu>s-1%F$h&VwYBA;4Ph2W2hD)E8nA8u)N+!YQJ7&RFh4z>Ocj$q#cy% zw;l6mCcno@$#?aAjkZ=688nMM4u8nX%2r}c6{hMv>UAt4o1WQ?lyj$7RPfl)t#Ln* zWp3qh`y7v3&E4W)!_x2&F6#N!f2l5CJCFK%DK&f(4h$11MuyBaS zW=#TOn%m?3mkN)aJ>R$iSP8@`6N^j&xyi(4WtFpr;5_Q}d`<*yJy59 zg|?ODR+-r268LqW$>~b<_oxR~`sYMryg_$w<3K%Nng0nd>P3cKjRzIr zY4axjE>A>O_-itv+4_%B&r6g3VPx$R7pfZR45gllD|s>Q4GiPeVpi3sVF!)RToiE*W&JCmnw*(dj$(l{tphVT^)50 z7hT*-*9z*^`WFbI#r7QP#pK-&U*!Zb!@ayDpCtDZkRuzN_S}0gsEDaV#0BeObP04b z<>%_n#r5YT9Eq~_*eWCBGiJ^wHunV3V}t#><>HmvEvOKMd`Zk{A{R<^fXQG-VQ72( zV9@=oQVK;?J_+bg`nd%&2!ew@K|ljz{=CNOJD8Ao%gvgl%l|d7GI1CVgIeq_ne_Ft z2(bxtYN3bVoS3$wFfIrfi3C(YI8N?*#!xjJfuaaQIwuk7eK+sT)QrKA-VIQfN>#r9 zxcIK59uZ+Y9j-W5BQ%@ak*ix@yftbcS+UF|Cp<~q_0J{$0=tKr>95Ju!2kdN07*qoM6N<$ Ef-Z)(;Q#;t diff --git a/GIGA/Assets.xcassets/login/btn_right.imageset/btn_right@2x.png b/GIGA/Assets.xcassets/login/btn_right.imageset/btn_right@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..18e7448a429ced5734e5fbcc1fe7594f8e7713d8 GIT binary patch literal 873 zcmV-v1D5=WP)Px&BS}O-R7efImd$GuK^Vq&CTYDW5$uvPyU?<2Q%;%;8+_lMn*kI~R-#E-I6e#i^+q z@Sd=gIu<<2unMsP!AW~$Dq9J&=K-BP=A76#vKS%1XSD+HTg61;Gz~}c`3FjfI~WM_b_oNkdM^_=w=Jb>`>|C%)Ip`Z?Lh-z zTp)pSX6UjxCm}G?(4kbU4w}n7RDj}qdS;J~`WFacCmZ~CFpz~QQlgMbeG5Eogec+c zyI?OZefDcqS7Tc+yzELmmpd-8VKGhOo?oz5HzK8dHIX=orQaS5eu!?8EWIu4;o+w+ z%-2Bv$`*8XEuB99!*PzniTkYOG*XJ%yysNwTk8My156~p$h?Cf*OjeT*oA*+QPca{ zQ&FeXljhxncMznl?AgLTsbSt{s8t7~L0@=q2ib8>IjBj|zR>Vro;;TZAUl`>?6)&W z$2ga>H@NAO7hzl_=<83T-w!YI@4|h$n^*n6uq1}3EUjQ-00000NkvXXu0mjfyQZ43 literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/btn_right.imageset/btn_right@3x.png b/GIGA/Assets.xcassets/login/btn_right.imageset/btn_right@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..eb743c5850020c4a619b4e59fa327e76f6a7a56e GIT binary patch literal 1342 zcmV-E1;P4>P)Px(_(?=TR9FeknLBJ8MHt6-<}Senks!c5T{sfRzFpf1E)a$$K!FHNAP71H6$KIn zF996|FOh(tK{QB&3TP-u3>|@c+i1^X%Tv-LCKU z!bqo?`R4Kc=9}k!$DBO|>3RGA@cmiA`F)O*htbVAemUtl2dGQtI9CyE;) zFJv-{tXkco@}vR%B@1=ey;BPD43s|sz?%}aX6y>ue8D*XxV*A*F-hClppD7N>89_$ z4Mh(nQDCjh*xbHM=9T>N@-NmpMnO+ddGzQ=z0r7+N%BoLEbY%^9?Mm$zuA;nK`(pWUBdUzz>2rp8V^zqkUx1Q z^Kh|R{V}TFNKgeS#CKB48>1SfC1Z?Tx)lRhOtt_h?QRsNy>U$aw)Ej0mUel2>gk+pwOT)8L<2p7+L{t3 z0On`2*%^J#wk=AB`E`S2>@VDO%jQ^!MO`pELIq0K;=pbkQ(KHQEcfjV2M>;o)@oCn zu_psfa0@Cn2o50Lfg>2Y6(uL6*i!3&KTxq44_l%^+$ zvLr#uW^*1;#VF0hm__06&P_b+N@HV>nA6=0Qh|e!HWR(f(+_|whafkmrY4+bbHQdw z18ST=bA}+Dqy1O(1ObtnzKhN6j@!)13rT_nig6RS@5z1v-X&wYakKEZ&GHb}p<>O#BYnC&+Xi zoNkXRkt`X6oSdux@?6a6-t7vEq?A5sI|E~42U3-duC9Ix3qKvpvW%UHg!KKmYckBU zNuXN+X?Q|5`nRM~OI{XUPd_i!tbijoL7FZ1O!4l^uOrH`#3L$8B z?{!V?Y9|*E41n2loORDT;`si>-BNoBXX;Dv8=bV(P>{4H2Xx~>-wgSw)R{P1tzLp< z&f1ilay(?;#jE>8Q>N2{h6K}`cBZutZ#b-8#ae4=rQPBv*vqc#!Lu?rOXA~>oM@Uu zO})-+xb7*et-x`l%c5eOsc*26kq_k7)(kez=|N4m(#6>O_>O9`1VG6FvC(KOViO#R z0vn=isaz=BZF=|upain%dAH*;brIGXigPSHcmVZw=};qb{lTkt4D0n;xRbQ=q?0^) zVZRgUZEq$M0^YQr;8nYyMrX>?Op`8~Cy(?-f>Hs&V%N=Ll$R)jlRngq7k2(^cnj~pWAR$_sD;Cv&PnYA>rp#C zsP4%4`{r>#->l`aVt75!=JQnlz6pa2`wy}I0AWX8*xY%ong9R*07*qoM6N<$f@FV; AdjJ3c literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/Contents.json index 5db27e6..48dffc8 100644 --- a/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/Contents.json @@ -1,9 +1,5 @@ { "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, { "idiom" : "universal", "filename" : "btn_tab_desplay@2x.png", diff --git a/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/btn_tab_desplay@2x.png b/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/btn_tab_desplay@2x.png index 11206974492553226353b8a61a01ffd1e2bc4259..d5152ae0b87884c2934542a1e508a85602fa4f5b 100644 GIT binary patch delta 1873 zcmV-X2d?<$4($$*F@GmXL_t(&1?^i|OcZGlt{!HFV}RwpM8sV@0oQmWi$#$KxYPe z>uaWUhW>jP$2nj!m2|qhy8f!azy7i?@H@{%5=rTt*D+kY34EKlYwi`8Vwl9a{A zv0kbiT+JlugCxsuxKnRPlCV888I9MbG&Q~SrlZo=G@(Ac>sj0E;HrqBHvD-st#CnR5o?PFEFO4^u%JSd6`=BSL z@&^REJUMv@^?&sIArqymjl%mc2rz(+6cO=j(fjv*e&K45bb*#-S^7IMaSu1y%OLB@ zX;lslj$|@X{EQitv|s^6j~z?qj0|N%@2w3D%GO;~MJ+dPQv2PzB-?DdH^$&FL{#!q zYwJEql5ngcA%OR@v!kiA^EA7OWttX4oMB2!qwF0!D1T+yGBU=;dvrJU_I7H%bcyN@ z9U@zk8@DV;m&jsSJFULHyT4)$&=|?(Nl6z&4P?n|rtEFoD0A~>im+Jvpes#mSj z9o-CSaeq-;TZywV7oZ&Bw@u%0XscQLh>U#cMql-b6 z`2+cj^9S-X(2fwUmO&1g=mI0T@b+z=gRCM8uq)@x5sqvIwvj`>JT>$)sEw33IfOul zPlmhj^+;Cn!XCO|1Gf4T1}rdD`3lg;_>^Qs<$s329v?nm`DAx+zy@rI2$%v}TvLGV zve~wTQpN|Df#@Po1Y5AFA)fb9rY!h^0yKwoi#0++n1MLi+Yrv1+lDRJ6cXlzm?X@? zS*_Mup^%5nxS}G8;NZXQ)-7QR%Y+G($Qc;2ukM-}YC3IXkz_Pd%8C^fJ8>e( zc7Hp4c>I`}uUsMO?G=e@c*yvs)Yf{OjA#^i$v{%`FfUJ-L7L6xJcBaT>7{ZGVJLIc zCd$8loif(17ivl0uz?Er0Yv8HQ17Qtiu^>5LnDU|*T@@qWFSh&J$R5JVq?jil||nl zK1}&HZV(=TCxo=x(~Qp(eV)p|CTxoc7=IhsH%}H_9EcZFP(YI^Dir1a-MJ$a2e`Qh z4$!MzyXYnRu~$2H(qkUo_LdeJv46j&&2W|jxR1tif(xn=C z5d(7FNmH^=n9zb153EA7)Tx8AZ z>0}i=oEL&o8_57ij~-3!_wKpq&^y6*AXwzac9zkx{N$Iu;p5o<0~y0^A#L?)`e*A_ zw>A+nSqcjk*Hl+rJfwjJ#t82?iGK+U!Ig~X4;!M0cNZ?WHHx^@l$zQXrm>qMgA$3l zZ4>m1vM!XekryD}^5rOmxw^f36&Yhn3Qco-Dtoqz2br7T%OPv_6q1sQTV?0+K6nVBwq zu{SqU3x|(M3m3ZZ^-chEu*i+=HwI-X-H$yRbM`Dn#Klp??Ag@G;h-KNfk|7lh7#t@ z(}*D9K}hHcVfiUoq-&eY6#(=je|0Q*(IWb8=1h8hTQX^qO_+sH42xMONbqOs$kI~E;M6~m)Nt}7{kwg;)_)`y+)Qh2E$oY# zxbj9T5j;-s$B)$g;)Pcrqt|#du#g%kf-Tq-k^@@>Xp}dxuO6`4MyO~IGEowM)#^YI zYzfN{7*hpX?uY_3YREX&D-Be~0$~Rw0a&f}H^ByMi3pgg^?7}+gQZYI#tvH?af`GJ zavtg~P!gaw;pL0&Lw`4Hh-y55B`{U(dqdr7SPQj)kZ^QkJq`17ZLmcHguxg zK;$wM3>iyx1sr&N1{x=hI)oA&hYEE)d#02G_|lC)7s?DoH60GzN}Ovtz+>=TDO?if ziih)=PfNm}I9%lD3@<4Okk5-8RTJT|-3Ib|*{%vU_TfTwXG%1*$LxE*tq|Q=W%$<$ zXEYqgzW%ks*#yd)P}QUq+zg_*5$8Vo{n(#B3yC@({{2maiazguA`%Y)n+rL~00000 LNkvXXu0mjfP6?0D delta 1866 zcmV-Q2etU^4(1M!F@GRQL_t(&1?^jFY!p=#K6g9Y?v}EB(#N(ut%Ns3jUnNOCK?~V zC@K;SmH5X<15pEij7fR?G6G_v!9OMj%MS@gB{9($gPN!$MoqC`5G!KJZei_xBl;J9+YL-r`8)6YSp;9N2s(-C3T(s zp83;KkhrJ{`b;R|y^i{gA-f~91$0~JQrU1UzK^YSf8JQEU4*RKvBi@RM}2PP*ooS; zVXJ03e@dWRdw)8g;x~AL0j|?K6@Co}2yv6Y@V1V{n?5ygO{bPXv+otH!Qa~%-~)VE zwlhhbCyXKzw5Ftt?(>#Yqf$Z@MQ*C(12mY3(GVYj_&EI*xkZ1Bhbckqt*uBf)IuEU z@NYQGzFgW+3gByMkGC(-cT!bpyOr$u$}e{*)Z(kBEq|qz*Kwu5=t^9a(_g9=am8Y>q~J#qMT3^mFN*l5uk0gmCc5a2HNn zvW^#iAsafN%S0RwYnUc)Xh37d$CkX`)Oa2CueQD)>8FS~A#IB##Fo-3T3%dA2@dA3 zMt?`?d}PofYBh_%itl~@I@^m8vxMw8Sk&weUX-pNi;9(I7gC+siN5nW;InySQ8PWV zpjs*h{Px;=sfL%g2=X82_DAYh^R+qLDiJO^#8JY|ibnGAIhMpPRyJw!?XBTRTUOg$ z@kt*zOD1$;NiQQ{tRSB(yEzqa3CE}VYJXPHwP=Jcj^CCxU<O&!C+e3edM~#h?xf z(3^Fu=(%z~y*qGC4SkDI?gMk0ZzckXoF{=7W(`=I+SwzCkAX;u{VW>iza?~Uxq`IAb*2* zgI!G^Hb%9QF97$`2??UvA}ig%Sm6i|J0o{Z|He#t6O)X7egUU%_0ou%NV!*0q-Ytk z6eeH1#Vf6J0>FL-?{ah`{g(6^S-9CEE8W0YVUV-3Xghm8a zQN)w%%Q1oTV*?U0`8w13mq={8onfiWza=k}Q)xRTvfOX)njjvuD*x8-d0 zK0Z8x;|P98{%1S#n3>U-wOHW@j1gt`^0Cm|%{dN&_3h;i^cY*|8FnQ|HBLnzb32fa zL&CS~*HDUq+=X)yEEVqWzc15Ix|r7foastRv&eB*aQLFm_=pJyYlD-g||UE{KWS zLw{1H33QYv%!k=`Z}j?1DwlGE63(!*VeEkIr`aMa-N4v|dWBp)*n{2*TFZXL@mR9H6zodjV^0p&|8mt5jqm1j``+X;(!PJz7?Cx80`I{u}-pPYzu-$$vn>4ezw9*Rpr0 zyfL+yMMjJRIcyPS12P^PUj{Z(XNsT;I%T9|s{xJjCJt8Rb}#Ea$9X6TuoFT$H4NyI zmLZ^i57;tkKx;K*T;AlA;<+FPB>~v2&NV>?bV-RZ)$8*#pwS35WNg(IJ)~mhG!rRV zlmuWh%@sj5bVzGFuzxuVOp`PTG zL7Tn<4!|aX#)Vdgz%^tz&ll?96e~&soOC0Q1)0*C4giNbytJZ6Exa>=S||xKqLF&; zXh|4E7m6HH0mfp)@ghfE1uVNzwwvR!T^(%v77EdgXh_bdTSJI$6j}Jw3L_fHbEp5b z!l*(kZ_=uosAVqYMvTvx>+_ucv5@TH3xED5L&ci+KQe(1ii*@n{r~^~07*qoM6N<$ Eg0;t$H2?qr diff --git a/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/btn_tab_desplay@3x.png b/GIGA/Assets.xcassets/login/btn_tab_desplay.imageset/btn_tab_desplay@3x.png index 011c0196d2efeed0fa2d4d40cb784bc6fe2e200c..c60b4aec0937d4b5ebe0aedd083938be11885b85 100644 GIT binary patch delta 3103 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 delta 3005 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 diff --git a/GIGA/Assets.xcassets/login/btn_tab_notselect.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_tab_notselect.imageset/Contents.json index f9fd4bf..3058113 100644 --- a/GIGA/Assets.xcassets/login/btn_tab_notselect.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_tab_notselect.imageset/Contents.json @@ -1,9 +1,5 @@ { "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, { "idiom" : "universal", "filename" : "btn_tab_notselect@2x.png", diff --git a/GIGA/Assets.xcassets/login/btn_tab_notselect.imageset/btn_tab_notselect@2x.png b/GIGA/Assets.xcassets/login/btn_tab_notselect.imageset/btn_tab_notselect@2x.png index b8f8c13436c68128f0f5bf78527d1734c6d70dbf..ddeecb029c9b7e563925f334c82dec5d062a6e44 100644 GIT binary patch delta 1346 zcmV-I1-<&(3gQZoF@GFML_t(&1?`*7PuoZoz$fNQ3l$)ch!g}IdV_H4jgP;fu-a9R zy`%P0dft{jx3_BVdt7z3RsRM)E~w%_;8qEcNEIXyAfV!V-_Lkb+hcc=5Ifybo@9AE zo|)(Q`Q>>&UNWjiSzca#cyn{}SgJpgBgb)jd&~KO95%>FCV!JDN=NkZ$#I;IlarI5 zYw293no0t9;QIRdnLNO(K+RWE*Os!<_k#5OLrY7`JAuAeX}>B0y|J_{BQuF+cfWR)vF*h|e_0P9l zGZhP3z-9#UZ+}wd6=}2TU5+SGJv}|DzrSB~c6O@v_IB0L(c#`aKR;I&7Z>X6>`d+N z@2jJuBPDIcHTA#E7Y1}{L16#xrH#Hs0$f>H`AK~7p91AqqlTB!*4Czmhlka`z<_FP zZH+4y$iKR}QhR%QYG-FhU0z-W?%8l5kl%~%emXHR@qabkAA=CqE0!D!84CvR;NYN= zM#JrW_nH@y%jHxyn^n8JyDo5>EF8lW1LaryBy8D+MK3NczLJ8kqljU}qobp$ySqE; zcGY>u$H!`ObJIHO7Raxsr>7VEKmwq>58vMcI*?C=uC6X6U)Qq#^*3^#G=98LD7b$7 zKJENSb$_vDIezhfARYaH4B-SYqYDEvmYf7+bo1fN=kp33wg?Pi2~*vtGH7p{Yz*P# z&A9GDk0f-(dY)+;mxL}`L_lX@s{7;i%$xBswJg5@U0`Hn#Qpf`>m<*NMz*)NlT?v* z+b1$$c*qRWwP;zhcrH(1K<4Mn=prpamrX7NrhhD1z)!o5nJAbH9W;$UrB$Z4wycI#^FO zgtd!CNh5V9)aOTlX0hH77Kj=pjnth`pL48rM1p1&u2E8pZu~k!QPxqAQmNz)73KRA z=zm7N%LN*bzsR-9gG7Q(a)J{7Ja>0$(GBFGp`miqI=!{ERn8+(?{b00V=iFq$Qus6 z@|ePDW{0h?65ZO8{bke0^XrRC!x$g^C8_|6J&h7J3oMf_fM%E1kVba47Tx&du%wX} z)){kMk72l-dY22gA9G#I$U^@M@riH41%Nz0 zJ|50a<$8U6T^$}CrlKniCE}y!B__oA7^RGjRQCAN7IdQ9CV{a-SP>w=c$$#>E@Bie?L0Cua>5`T1A z7KXsWKWy*TquBuv6Mqv06boawI%z?NZPpA^*uu`WXcEMb$qi#LioYZzAjt^~ZKK07 z-&}$zY>_f(0`&y+oE*lKoS(Do=q3VNha1@BGGGWxfAC`&G}OH~gay)JIXyj9YinzD zbtAY7+N@=Q5`MlP?3y^dK+vPHzke@3UqZtEl5=F-oxG`pQvd(}07*qoM6N<$ Ef?iLg@c;k- delta 1338 zcmV-A1;zT}3fc;gF@F?EL_t(&1?`(jPaH=SfNO?L1`7~Kj5G*1_y)ttHo>1!d6QH3l;!2+M>jV&UrF`HauhjkZ*Mt2l*0u%$$#Z?73qjR{>XpOd-wX{6y`7qxI;mGk=l?6{rKP2>1@JF&6m+Hb`7;55U6td-+}zwB zpL6Y0UC;tHCx4KCk}9uA+g0y!M2Q+07*NB*!>YHpS9N!HtDc@7@8PsZRm6eqT;){P3DBoB${EV)yE;T+ru0}>i zRA*;ry<(yKtE(%ux3{Nuc6QX|l z`=f3*op*eEtTs0{owII%{Ca+Vejx}X1ls@b{Vt$G`BdoZ>r?V|t@+jz{ACx97USdg*gBp{=k4`-=VQs{6+UOR##`{QJ5 z2q$mGa~FCfp)1CDrfpmjx?B+fU4W_XkJmGQ#>dpM_6Br;iHQmC)VEKW9c4X$iVqa(^K(Wyu15+I2jMg2^zh*&$q1JB{X{ z3!N^BxWlLPC(kOJ_>+>^Is7G)k+cP!j``{mjPw3dr^S&cd|c9E52sXL)QKL#|5^_H+el$B(uJE1-oS?h=d%_>}05~ptbJwsI1SCDG8>J1^~ zyMGkwUfktEjSJ&WQ5Xq2$q9<_5Y}a!x`8}4HdfQ2(_33xwLB7WmkTxyWubpUjp+AOZ`+sqlGup4@WTF2D@riGZ8y@88>1i`NmFxBO zb#-`nn2N46l!%XhDKR1Wk5S6lNM(;NZ9ylxT@o1QiM$cwWwT>^`PoQKThJNjs3Yy? zH}%05#(WIv*ax!!*Q^h-*_f7~3!N^BX6u2L<;i!_IV;+RkN|e8(-L$!7KXsWKYwiR z)}z@05EFkB1r!Tow>oJ-hildhQ`o}JvuF~;kjV{e(22h!Bp}HN3~i&sG2dK;DQuA% zXae;F^b0wxDLFr9+0jh|whlLN$z{M0mcii18fd8daR>{fO*uV1RcmW&vAPl51#QMT zK{1~@qif>uLP3w#{=WQt2?_g6&VP|{ck-t09TKKH&FI3#kTCiueBKLWDj<42jUuCA`CN~O}&q=v}|b*M`lF8O4iofqUN>@4?dS+s`gTXs8aR|EON z*$3Nv*lw^*KOV0gh#rIzNDJiF0?`9)G2&?dwIT@QE*ua*VhlPu79rDOG--G5pG0v)d*K3 zTwbKA?_9C4*E#HUgbO=DcnjghR4TQI@W+aZigb5(_en7>x+Ka%CnqNx0Q@PA?@(?J z&V~R{8rY{S5(m*UIKRX3wzs!;+b3CGQIU`Xq!>W&@Ds@J1Srb#LSiySVSx(}I1j(>DI{TPJ!1xH_@KurE zvB`Hk763`cDl038F)!H+TVrT)pttxML&z8^x)-)GlRh>J9Ac;$?Cb0MD-42A!^|rmwQp2TtJ2QBB0u?cOu0jyL|&MCa~w={ zgM^paC(2b4gF^|& z{(qzhu@IAyyex3fZg)>+4>>T;_!2|OpeKdT4^9L*$B1hv@quJviDTa5hegLYwmaM3 zjom{ID4x5OLE)q}fmB)R)0Hexgq-U4iY^1#WN zAqSTAJmZwx5RbWcp^q(H4@$e=slj0 z56o$i0})RVmOjD7n`pdOqKia%Uq_c~jtFO&&4&y*_{^tNcz2Zq(M6m)!n)v15>AlA z;zNp0i33=V3LI~{>n1v4PKb?r$cvQy`hfHnDkpb*9z!=FW-~Dj-)iVN%E^lq0)G!x z+4%&Q^Td`aZIblFOzcL&TY$Vs;l`En=7`P))){;FCXFr!d6B}pR!I&%@2RWkj6F`9 zlNVgJD7O=JHgGYpbD3OUUoUVcQ{WD^*xA{!9%0O-G2_ac3pRHe@`7tq<*iJemay&% zWH@TSYc?`Gfd2sSOKRDVwtf53^2M#qsBGWOCOfS=^@&@6_C7w%J}e?(V_5dWMv~ zD-rQt1%-}N_-1?3g&2v|NO%j72aYe(%)J#XU0$e);^dBwQ<5&kXeOfhwUV0$8FJ96 zDOi(M6-kdeN%n_9Y{u)4sulh9Y=5_N+YC9F9Lk^lvw36bFeQn@i{s42i`M)KVS!P1 zS`Rtkz~ci5GUiU;7k_pdAxT{~u_TqWel|>69NYb-w_^`E2pEsm4dZmE0?+Q79(9r; z#FFIUE-7{jz;S4|yGNZx4tjUNq+}3GQf@8sUI9Jo#My(eZsXO*)25+*u$|f7H@*6> zkSuaA()JHE!mvt6kh!_JSmq!c-dHy=7|GiLBYytCSX!1(Fn@Oy@YV1ee&^)1*m0b4 zTfRFugqS&oyS4HPzk#FLAA)j9$zhz-2AS)~sGhU7*l7D~Z&L=mx{Pr*vSpl|F)8}|VxlfkP=x*NvAO&xtj^5l74}+v2 zayS*ycO}3)14+!MLmi{UbGAMmigtL3{fmDJg%Alj91zpf)1Tw%t3iM>A02j#QsguK zl*#_+u;2C5;h6bcxu0di$B_W|!|}D%Tm4-5|2U$_^$>}RNvr?>002ovPDHLkV1j`z B>v#YF delta 2062 zcmV+p2=Vu^5U3E4F@NGoL_t(|0qtGQYZgZwp1cVO2?RB!X+i`~As7e<21N4FN-q`) zh2G+&g&g_^#Co%bdaL>ec&itM9)v=n-fZ(h6!fBC3GpI+Bv`*fNJ2u?KF_-IvirWX zGw;0bzPmeNez5H9%+AcSzj=1P_qQ#gNpkPry{?^|or#YhKYyP1@ZrO7OH0cz-2KR| z8}4qn+nbd2zDpMR+J(M0@L(Houfe@sDwUSuzTeT&u`o6^w$+S>Zb>uI#l^)w06&Z4 zJEVIOXHS4M6|6{$#DVu+oNwZ|K0ZGFQgK^dUa61+q?khO@Ds>z1}NI}ph0`F!FE}O|1>)nUs{xQ?0V!UXoSgi--jwSi2l^8O+uPe$ zK#J*lGxqVa(EvztqqDPf7X6Y{+Z?UQf!gA0G$A*T(E;1c{QbFUU>!}(^u)x(Up5G= z$T2@ZKa0eFMU7Fi$%OX;oH%&!U~quRf=63hn`muq4S$k)|Ngz$+uIYUk%HshyLW;I zh-jOYzh9vN)F4#kc{DRu6v0Zbn#i%TveL1-x_T8Ue6LI;!IOpG)6*jkA3iJ&9XeDd zLc;A;-XzT1w{OMk*RRE!H*W&+RNdq~Y&CFgU|`_Kp`oE2Q$!;<=H});Ln43RIAuyq zhO?F!9Df`XM~)l`Y6t1x$eFduvuDr5^XJcfZPJJ$KgC_b>D#HPssD6IX~_}R7`Kr? z&BW;M?-xgp9u@8F&6(oZ-Q5*Wo;(q2Yiqja@?mBTETINDt*b$_eTT3qsfidQ!|~(C z1u|=ytYuWv*Vh-k$?Rw3Aso%1`4cZ+rZ#Jw$7AG{ zCr2?jzEKTxtH{9#uC1-De}UFGk3nJ#4-e<|V9|`1mzO<3q6)EduXlBI9jlxut9soz z^M8qSjl^J6!nVICLM+7Or7jH|2+KVdIYtijGrmMqG99}^alwut`xtpOB??FZmOT1B zDl9JgvD{hyQS32tAmCy&Fv(riLXf0Q!tMQy8iO(a~66hg14I*g<~y@PAI0LW16~fU6?6u0^SYwIe&~FfbbJV zS0!ug9F^!q7p@Cqn!0dZm?^FbFL}XcWmy#%^~+kp(YzaVXN{d-E~q7v<^Gr@@EWSz_mB68vO>!)P9xo15arix=YY+hBc|*+feZLD+4O8$$xlu?6MvfR^qU|Cg!BK*fuTO`&kRdBu%lA}>lb zI0gspN+k;40)Fl8nh-Owd$H31`9NNjLQ8aaP0?uv!8LIab3t@`m%Ioj!N8Q8CQz=~ z$KVi_n7!C*K=MJ7<2sViPG(5^81`A^6NBw`)^i;BJZb8=(jp=G@PBC!DQ#E68Xym(Ez|Pa3WhG1Oi8hGN5d&a7h?1s(fUd$%7ZdFXw(#}SuiC@ zi#kQNhe2%K>W`@u)!{7vsBzmeIe0q)e^y6}`_f=a5t|oj%q5Q2Us-72LiFAkIbgu! zHVASfdV|U>3!z9=H-E7dm9#1y7R`_4UTN((Mh*hTwz^rI)=l79ebb^&QG{5E+}ssK zPYF2I!*Y)WSCNC(UC=3+29u0ai(ChwMV&lr5a#Wz`ozlA>VoCW@~*V%!$hjcLC?@W z)Oos1LV`Sa@F15y2%9(NO$=V@*1&m{Jus$LWfLr#1#C6^hJWjttQJedDOuU>U=!l| z7}3(I%Y6-oYJW(IsU?RuQk$fK6Xx&%U_rWdh6c|v!e56fNyAO#muFH}y6+aPI(95N%?t^}BK zAc_BVs8mWm=it|&D2L0Kzxbz72&s@mg1B?%&ga;DH4Sk7r^8YyO+MqLEcQ=_RnJd@ sWBzyLD$UsYkpOt%_}OZvzbpSAm=ekLwrn^h00000Ne4wvM6N<$f?$OUQ2+n{ diff --git a/GIGA/Assets.xcassets/login/btn_turndown.imageset/Contents.json b/GIGA/Assets.xcassets/login/btn_turndown.imageset/Contents.json index 9abf196..57ea7eb 100644 --- a/GIGA/Assets.xcassets/login/btn_turndown.imageset/Contents.json +++ b/GIGA/Assets.xcassets/login/btn_turndown.imageset/Contents.json @@ -2,15 +2,12 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_turndown.png", - "scale" : "1x" - }, - { - "idiom" : "universal", + "filename" : "btn_turndown@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "btn_turndown@3x.png", "scale" : "3x" } ], diff --git a/GIGA/Assets.xcassets/login/btn_turndown.imageset/btn_turndown.png b/GIGA/Assets.xcassets/login/btn_turndown.imageset/btn_turndown.png deleted file mode 100644 index 194482a7ce6ef33e72003c3c85e2be88f2c26d8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmV-|0e$|7P)Px$JV``BR45gllD}%hKn%ux=ksDiw~U$62Pg(leSt2`k_0+;PoafOd5b1pJGMjV zQZLyv8vF#w6Ld2e4F1>eyZDM@+!7)XvZVW+bh3oik~oeBMN!P_x*j7uVoC_Hg9(*V zE8q9O8Ka1Uv8*VHCRJ6v!oM)Fj!mSL_dyVRGOj^FsPX~*y{H3e7u9R%jIdyPd7iVK zzbduwDB+}z<6KI->ERRzm0oPy9`Y>bpwQlJ`^vs=LU`X}S(b0ib9fR~Pp=PXV(S(( zZDJ#WT9BMWm&R}G8tpwbl?-$^k2W|MmcMgd_Zj|zJ}y}i!Y_JYfzM=RF1 gPx%=t)FDR7efAmP>0BQ545JlekJjs|y9UMz_|y=t8;@1WOk}ck#7wqhG*&0{sG_ zI~Udmh?`PD@qyqXB$+^oWKmleF5C%KNFZV!{{G`kxS8G=EOX2a!mHA_Y=vbGN} zg`ZVyG4$a7s2WjBR3HjsYb@tC14wtdfXdDLi)&f)9w2QHS5XYtj4ubI?yG-8|tkr5Mvw2%Q zvHZ<6CsBSxR9&mc-%tJ+u#l1DZS;vb8Y<{tu{@jfn^f5kpm(tuoJgS^`bT7Tg??;i zp^sR~P~S7NU9Z(@87TnYqq`Z+bP`wq*cPx9Jop`Naj?_ryf&feZiG+^Oa)@yGc#^5 zE~#iXEE97kv`{GA7ZkgPkpdCyw8h`563f9sr_CoUY+v==WHNa!lgZS~2thT*g5kfz z7M)aveLf$z&49*uC{yXnLW{+?_rtV`o+NTI}R6_|AIV6{&^Yo zlK6XUMS;HO{|_}lip(`-5N!Ysb-UenocN#P!ic4-Mo|pK9sKcmgDsRRh^_@wX^N$o ziX8?V0Ht74b>Ue?teMItMpKNT`;2^tfKmvmI|y&4`^`j6zKRhfFcf3YkrmFeSGova sW#3lO+5R%2so76<5jGPx(nMp)JR9FeknN3U+K@`XBmNX`mASj?WIS>${d?qBtW92E&l(T-DY-}ZM(3oZZe(O`FQWQ zZ{EDwoqD!y@|vBU^{uY1wy&?RcR)lvQnkn9DMwyph+IZn1m!uTFxmozg@xmFb#*bL z-BIRo)Ek|rrluN`$>aqnJ_C>)4#zK||B$9>&sthqLQckJ4LUP3b0CpO+y~q-CkpKP z;z38fUhmE3=H@SUeZ=~Vp!4(d+ar<4T@1Q}Q?@p@ZDnSW}1@j&Q z{Hj4YtXsiCJEDTsWTl*LTJj%262(v5WRSTmpj48wcsCIeZ-b_=Mnx^um7 zME!Q=Qt_^;A~cnv1KS_kE} z2;XpJ$B~p}yanL9;^N}Ht*x#5vEt8)1IR=+*6E=dLBZSl$3N;RaN~l1sU;s!n|jWeoJ`ks?dyAwf_OK8pe7p zLb6N)l2JpULvGCFy^SRa89>^j(oIJCXx`!`AV(F`ofgsnuP11=>M7i=GayfhJ~=%- zT?1=*+F7O2LQP{lX5cBqUJYFrv964AHj5Quw=H7hSDNEj@l96 zNuDAdLi-)$NxOb&>PJdTOHazv?GREIUw~f*+nus9fPF&%zKDDsZ67BlCgxFoj;Tuf zaDto-ka(Zihi!2zo9Pzhu(-_d#827{7wVG+q~6xn*7gGT=aI6p?67P}LgJ+-un9=U z(g>}??{3vqi=EO;WC2UaZgILzNXV)XjCxhZ&y6L=Z)}e{yp2s#tHpo|D`_hZIjjT!Q3&AJDMje*(m!2qKr^BYg_kK?u-c zk-woOMaW<v+lS6YIn>EeS|k(v=+#FVjtMwU8bYq4+ZdkBAEG%6OoMc(7}#cDEs6 zlu<%bS1NepL+Tdp<0=5TP6Z42IyWr|oe3VInYvS7p{zjM>_CZY;0`&F6-R@$_|JEQy6eKpO&RAyOTUJDM3wG zxIsGvFm&bm3R4$Ck@9Sm$}NjYMZ*OajYfMB4KAbI?QbiBykPJU?H=mrzgxaA zQ||uRAQSN{2-f8h&}pO+xjo%I;Fb{jUcwi1_xFtqkncal{sQ4sN0c}$O*Q}k002ov JPDHLkV1oR#NNxZC literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/nav_red_moment.imageset/Contents.json b/GIGA/Assets.xcassets/login/nav_red_moment.imageset/Contents.json new file mode 100644 index 0000000..fb1e4c7 --- /dev/null +++ b/GIGA/Assets.xcassets/login/nav_red_moment.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "nav_red_moment@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "nav_red_moment@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GIGA/Assets.xcassets/login/nav_red_moment.imageset/nav_red_moment@2x.png b/GIGA/Assets.xcassets/login/nav_red_moment.imageset/nav_red_moment@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8dabf029d1ad9b0aeabdb7076e0c81f05f716911 GIT binary patch literal 2066 zcmeAS@N?(olHy`uVBq!ia0y~yV0s5+H*l~4$&i{iCxH}Wage(c!@6@aFBurv&v?2x zhEy=Vy|$6}fB_G)$*2EFfy@l2q-u-9JtE#`&G#y zK_C+BjGsImWGnkm#su!pTa)R6mHdEqV9b9RH z15h>p6cr_yPZ$^v-{prZ72x2Ic-J_|MFsAYgdM*TN|_iL58DPz>Ofe=Q*IAeI_ha~ y1dqlv$7u2fW!=#{Jz9`~3&+vYo32&X2j-@JrfD2@+{(a8p25@A&t;ucLK6TF-Lj|v literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/nav_red_moment.imageset/nav_red_moment@3x.png b/GIGA/Assets.xcassets/login/nav_red_moment.imageset/nav_red_moment@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc000909564502314d7ee6f2e3bc23157d0e77b GIT binary patch literal 4282 zcmeAS@N?(olHy`uVBq!ia0y~yU`YkC4{)#n$+ac-1b`G{age(c!@6@aFBupFN<3X0 zLn;{G-q^@{z<`Iv@c7be=N@oAP^{tIdVslQRrS4@`Iby990Cds4GfGhM&oLx->+sF z!ng==Wrb4}Ea<`x3JRxKUZ`=Rn!(7ls7D^fRFE+&OpAOP@+Kjyf|#vv>Id8s7-Q5} zVCano!e}5sa_4AD7)=SIDFI$_jAn@b=gMzaGj7mNnNXds~VU`A_)(b{3Ob{MFF a(Y~daS?s_XjvnA(1cRrmpUXO@geCxK!}z-Z literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/nav_redback.imageset/Contents.json b/GIGA/Assets.xcassets/login/nav_redback.imageset/Contents.json new file mode 100644 index 0000000..147d463 --- /dev/null +++ b/GIGA/Assets.xcassets/login/nav_redback.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "nav_redback@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "nav_redback@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GIGA/Assets.xcassets/login/nav_redback.imageset/nav_redback@2x.png b/GIGA/Assets.xcassets/login/nav_redback.imageset/nav_redback@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..36ff8e6128cf828d2b5a51d08ef6231cad391500 GIT binary patch literal 1111 zcmV-d1gQIoP)Px(5lKWrR9FeUm`zU;K^Vtpwk?4|!uEv(N-ur{5z0#hjYltNKu`}V7Y=>~c`2Sf zdqeP`AZmcbc*Yps3ituMa41MZTY8}o?e6%03QK0T(3Wjs6WC{;oq2vU^ZaLarkq{z zwd(ixnL@k)#^Yjam|rDtS=UDa7#ED?IGppi`znCT;cyK<{ zW*0zdl}YH`5n%ll1+E2yt%hMNFd;%RjB&o}*0cwaWHP2HFUojW@%sl%!}wu`p+}oc z(;@_;@MQy$C%&TVW6U&XVAm*Z=6p`n)pd6zlRK8btRW?Fu*1V?^y-lnknRX7(5s1# zWHO4}DY|hCTn+@9Ir4>Qw-gw}ft?=E!G2pwybH+1C}Qa&E@KCPb4-h zfc<{y96}s}hG{O@#eu*Z)h<_CAsE3+29h|iOhv^x;y|8eSzTREOCqsr?~(nvq#SO9 zLf*fb%rq+Z%K>uYU@Y31PDf>bA-gE>R2+-QSBo47y~+rPqbrq~ll{f)fsrCopPI9+1Sb?DtO?LVN(MT5dIZ zHq)f*J*|nvAK8ByTNzRk$G=SGJ@VBj2SFi$zp;*V`nBwLVxIva`LJo4iwJU44n*R> z-?NTX>Wl1mYUfs(l|Y~!^J^YK8s$I$#o38Cwq$=fwrkbryN|qmN4|795W2qZ@_6n+ z9KU6Mxwd99_SP;AEWRHbb^T6ce}AuBfW3a6N~r*e#9pvc&l0Ua$ zwBFF5)YjS$4!&_sy9l9?w%MEE~GPwp|8=Swa7j#EY z!`W>1Cv9eBe>wJ94l&Q-RbKCH{g>BUz?*&b4zV%M2yE-FZ3@_4=7c>h^0Lt^5lIZG!b*X(rmH{27 zyxZ&NIqU_BJyTGuOmtiuMQ+u2)R@}Z=dzg80>z>ic%K_aA*SqN0$@`huhto{VnAw3 zDM#*#0ttGpKPnKAuG61Q-eGtLPdq38u|UKt-a`vOVp{R}MgUNL7`if`1;!WWAv26o d^ezbB@PGLCv9i}5Zo>co002ovPDHLkV1j`Y`Cb43 literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/login/nav_redback.imageset/nav_redback@3x.png b/GIGA/Assets.xcassets/login/nav_redback.imageset/nav_redback@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..0aeb289cfcb016bf4ecc763ac099bdbf27ae3fe4 GIT binary patch literal 1707 zcmV;c22}ZpP)Px*Wl2OqRA>dwnp;pCRT#(jBqY#aX)bb^;Dw=mLyg)(LaHxp!0`ND)Xc8u56*{@%{+9^uX3xXtBEsXW}eZCI1mN?IQy|>10 z+&Brq2bElaJ-B8-&$(Q8ElJXVBnUN1NGbzz#ybr47*>N!@GvHs4m#>~ zzX5;jM|ZE+FjBW^T~9$XKRNk1toV!upujAao{Ju&{7alB5TCkN^`I zW1WFWH??*IDI)5$6$?t0gW7-$7R;S07_n(AFG`M$al` z3=1X-8U)NYT0w)Z9xAol8-kI@Z%Rli>kdjmGvaoCC5qxf1P)gp1x=aP`;c#D=I@n| zbgiq8UaYLF_%9ZtpxLUXJP9BQjO}ZTL=Ny|l5$$jt8W{2x$ef@1L*2Ixldv2IxMvt zkON$qWJ6IVfz`B+IGwHN=Hr08g?B#yFGG1teI)WbPexhK^%ri) z402gD=j5ZK6&01@;v!kGk@xgu(6l3HKIX}+rao)XF{jfPXN*?je1BwY9uM4wH6*Q& z3VLMaqhlV=HmqVbg9cQWtc(TqfTTCh2#Ps-pBRtR!lIOGBF4_x9S(m(I6Tgk$+LkA zNOB*mo{!wU)WqO`P+Ofk5$m0NfS2JiBJ7lY^eb_%aIh*OBdbBe@ zb^)?O8Ku^eZYG*v)ux;bUm$zKFfP8^| z2NzUUiD>V@npAUo#naw<|tVG^`0957;i0W!{HXvkJI@8xF zQY>9sGZ}5^AjsMZ5o9@AR0*5--WSDVur4>qpkShivDRERZIwFYa$cbHkZg8PU|Dmw z9SPJQjb21{kcDPv4`Fh6O0H8oL*bFK>gpGB z-Q_D7s0@XfY;SURh5Pk@A#Sj^xVSBsef)xh5^y4Y!&t`j4Zg=()zXRbODoUZw^j<} zTBfWp9=sKPdxdu|hP4{B4WS2Gcrwa*T|h|zwjY0`1T4CFNU1QbO#ga7A{S%wp0s+E z3*A6T7bRdR5labK72Sy{Sk?mA1C-dM1TRlc7avtqhAwUg(EAB6H38I-^&NJ5n_7n1 zFi>J6e+1|W0CRJs&BN<~yoW|4!i&gGSDscU4T@p(Q(BS)$Z1w%ne zF%3tQu%)q736fS`ws>D+Oinf!+Vx79Z2wM#zq|GNo133C4OE7v`Ck%6?Tj>IU8aK) zF#huPDE_@eLAG9g0p%HPGHtkzDgop&61t}-u?wqB$aQIFNn&dPl%Qx~O$lBMPig;m zqBdBxcTIFX!N^A<$fl;=f*U-KMN1rjN3r9$|9`J@Y^jK{v5Wu!002ovPDHLkV1kmE B7MK74 literal 0 HcmV?d00001 diff --git a/GIGA/Assets.xcassets/maskTime/ic_send.imageset/Contents.json b/GIGA/Assets.xcassets/maskTime/ic_send.imageset/Contents.json new file mode 100644 index 0000000..58aae92 --- /dev/null +++ b/GIGA/Assets.xcassets/maskTime/ic_send.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_send@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_send@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GIGA/Assets.xcassets/maskTime/ic_send.imageset/ic_send@2x.png b/GIGA/Assets.xcassets/maskTime/ic_send.imageset/ic_send@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0087a2d41bdaf9b3b20c8f5b3ad0dd7fd685ccc8 GIT binary patch literal 1784 zcmVPx*vPnciR9FeknO$rYRTRg&OPlf$t-y;}h=eLn*aq4rBq{F&;| z^d{4Dzs|Y8IeYHM+$PFONSRC~(bw0v1i2D3)jTOZi9{krU50#`=b|sqA&=G9*MCF1 z+G3?d94#Opf@eL?D)jFx(#A!AkD_x3_%DjoEh`GRr>AELgS7$r;6ww_XISm@n=w&8 z+PbGqnbNv=@#1gu^b48`0zQ5E^!%~0u{N~U2Acn5`pI?yc@n^MRaI4b!GZ<9tNHBN zv$qco4W*LF-rnBlF}fSAa$j=<`5w=9K!^Og zSfanb{|>;nVt)$;rus(4c#$o{c4w5)NMK;!#n{V^;we0^8V~&B)Rmka7#OG~+>S6- ztr-LQ9iUsS?8>BDu)Oct02TwE(02d74Xg2LYioZjFE783Y?sPPz_-BAbhDKGcbtd) znEjk?UKjwolgZGEjJv}sQx2Yj8` zsV5U_c`yurgX*miq` zemm5;m?Y0)<8@a@gYm?I#>?Aq;%~ma6)-MS-UG(yIvYqkSh1UeV9__vnki4lg~rRj zVqm8k!_Io;^|Q$fI(2yo_aC%;Au<#OQqhspOL)lJ4dX)N<$y(uvXjKsnrwDN?01(C zf80nB4g&z+r}G|1VLNr7sT>E|kLB-tdvn>&>*Zk`zAXj2ja5X+a2N=-xw-iTLMqr` zu>BYHTE}BUGk(A%R>g3&L1Fl$Ul?6O~`gDDNMW#5gW-Kl=6VGKzB}FZx$YJ|Zut8i|3ar_Q1I^B-ePPtM zk6TX}Q&x z0&6yML0`Xq-Oe%A&68)&oS6k%rC)hbz(I`YgE6bOU*I6L1JI9oUewZ+t530Y294e> z?0(G{TEoXB4pA;sT8H#tXJQSVLwPW))!5khJ#|lp>q{*Q8XK=pWCvg|c?nOaf+Zih+-cyAk*LJQrZ? z)jFKvIqFxIaa!AG`AHxH7GqRMDCuU$OEk3TlEcckN@_V{>{o1jxI9J=7+32Sv0IJA z@l3qDRry<)Mn^~AWc(^I0DGLT_b-(<50|kH26qoYZ_y{eI^2rHr~W;RyIErc3r;4u z1qy)q=+u?xVRa%+W&P^{ddAJ-|Mz!raPT$&b#>+KZb)4?_8CC{tP0*nZ=%Z!g+?vV zA0llZS9RV*|KM!m9_I5Z(gD@v@bK_QWWALEo=cULm9M$FS-`}}c|t>bx^^HLSj{r0 z>!X69Ilmr9^(uqugr$5zNw9>%ZscRWf*97+)YM#X4des?vYCn3?sV+Zjf^fioVv*D zfddC-bBmPOv}u!$hIy01K%RAArPD|#d=OU739L@Mt^PI8VhVU{KsPe}hoM!MEH%Lx z=Lm*ugD4}Ew)1P}T&W^~MS`&=jOhlZLS>+JeY97X9R9t5s$(Usvm+xTZ(viG=5~Bk z7;MhvSsP?RV09uqmJuGhAD$g3B@(*i*rj`eVm+?y77sp!O`X!bbyju(zl2!Bp752* zQ7JF56dB|$4C)qf1KtSh=-xn|;wSaN2u#|%FE8pmOFXA&U&^C{Oz_i_w{`ZQR)g>a zQ+qgt2M@PrmGO21o@t|UMOMT3f>sD6``^XQQs^&EIF18a-E}t9Wn8f+VAJNTu^jMq z47Q58xmI7Gya4D?o aZu%Ry0aS8Hh3pOh0000PxDKUcTpdUhcW)X>rjwJjah8|Kzo6*Onk^b|#aVMW`+= zF0LZ3B(4+{NcWNMBl&N_Swc7AG_=>}&!7Ky(uqFBNpQ!gR7Xe0ZNztD$TH&U0_AkW z=hajywRi5^xd%yS3gqW&9xD)T H9lZ}pxA>&RLwE-uo*_IDr>DdM#EBCpK7IA- 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 P00000NkvXXu0mjfZ%#Fk literal 0 HcmV?d00001 diff --git a/GIGA/Category/UINavigationBar+Custom.m b/GIGA/Category/UINavigationBar+Custom.m index de5a2ce..8b47a96 100644 --- a/GIGA/Category/UINavigationBar+Custom.m +++ b/GIGA/Category/UINavigationBar+Custom.m @@ -57,7 +57,7 @@ static char overlayKey; -(void)setBackgroundImage{ - [self setBackgroundImage:[UIImage imageNamed:@""] forBarMetrics:UIBarMetricsDefault]; + [self setBackgroundImage:[UIImage imageNamed:@"nav_red_moment"] forBarMetrics:UIBarMetricsDefault]; } diff --git a/GIGA/Common/BaseVC/GiGaBaseViewController.h b/GIGA/Common/BaseVC/GiGaBaseViewController.h index 72484f9..0e92391 100644 --- a/GIGA/Common/BaseVC/GiGaBaseViewController.h +++ b/GIGA/Common/BaseVC/GiGaBaseViewController.h @@ -13,7 +13,7 @@ { UIView *_emptyView; GiGaNoNetWorkView *_noNetWorkView; - UITableView *_tableView; + } @property (nonatomic,strong) UIView * emptyView; diff --git a/GIGA/Common/BaseVC/GiGaBaseViewController.m b/GIGA/Common/BaseVC/GiGaBaseViewController.m index 4893918..c6b50c3 100644 --- a/GIGA/Common/BaseVC/GiGaBaseViewController.m +++ b/GIGA/Common/BaseVC/GiGaBaseViewController.m @@ -25,18 +25,21 @@ // Do any additional setup after loading the view. //[self.navigationController.navigationBar cnSetBackgroundColor:GIGARGB(216, 216, 216, 1)]; - + } +- (void)viewDidAppear:(BOOL)animated{ + [super viewDidAppear:animated]; + +} -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; - + [self.navigationController.navigationBar setBackgroundImage]; } -(void)viewWillAppear:(BOOL)animated{ - [super viewWillAppear:animated]; - + } @@ -50,9 +53,6 @@ - (void)showNoNetWorkView { - - - // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ // if (self.currentNetworkStatus < 1) { // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ diff --git a/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.h b/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.h index 2eaf0ab..ea0b178 100644 --- a/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.h +++ b/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.h @@ -10,4 +10,8 @@ @interface GiGaNavTitileView : UIView - (id)initWithString:(NSString *)str frame:(CGRect)frame; +@property(nonatomic,copy) NSString *titleStr; +@property(nonatomic,strong) UILabel *navlabel; +@property(nonatomic,strong) UIColor *titleColor; + @end diff --git a/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.m b/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.m index 2724d3e..2135969 100644 --- a/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.m +++ b/GIGA/Common/GiGaNavTitileView/GiGaNavTitileView.m @@ -9,20 +9,45 @@ #import "GiGaNavTitileView.h" @implementation GiGaNavTitileView - +@synthesize titleStr = _titleStr; +@synthesize titleColor = _titleColor; - (id)initWithString:(NSString *)str frame:(CGRect)frame { if (self = [super initWithFrame:frame]) { - UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, 44)]; - label.textColor = [UIColor whiteColor]; - label.text = str; - label.font = [UIFont fontWithName:@"PingFangSC-Medium" size:18.f]; - label.textAlignment = NSTextAlignmentCenter; - [self addSubview:label]; + self.titleStr = str; + [self creatTitle:frame]; } - return self; } +-(instancetype)initWithFrame:(CGRect)frame{ + if (self = [super initWithFrame:frame]) { + [self creatTitle:frame]; + } + return self; +} +-(void)creatTitle:(CGRect)frame{ + + UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, 44)]; + label.textColor = [UIColor whiteColor]; + label.text = self.titleStr; + label.font = [UIFont fontWithName:@"PingFangSC-Medium" size:18.f]; + label.textAlignment = NSTextAlignmentCenter; + [self addSubview:label]; + self.navlabel = label; + +} + +- (void)setTitleStr:(NSString *)titleStr{ + + _titleStr = titleStr; + + self.navlabel.text = titleStr; +} + +-(void)setTitleColor:(UIColor *)titleColor{ + _titleColor = titleColor; + self.navlabel.textColor = _titleColor; +} @end diff --git a/GIGA/Common/Source/MaskTime.png b/GIGA/Common/Source/MaskTime.png index 76f739c9c81d29bf9445ade7b1b07bff31e041c9..62b135276ba5424b244b892fb558c6c35ff30545 100644 GIT binary patch literal 23930 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%0DAQ+$3zd7Qcsb(B33 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 delta 1983 zcmV;w2SE7xx&h}CM~P5QM-2)Z3IG5A4M|8uQUCw|8~^|S90&#g0043g-;@9V00DDS zM?wIu&K&6g000SaNLh0L01FcU01FcV0GgZ_0007Jk#p0Nz5zFrMgb&~fdm$l{{#yH zGB}eB1tOD;1Qh}@IFqFWP?O*SVv|b?E`MmF-n;++2O3F4K~zW$J(gQ@99I>ES9hPD z>6wv6ien22`J$2&6L11A`~Xrs@n?DCCs0KdRgf1TiHT(y#Wu2JX=XIHzVfZp4w71Z zIhVcn+H387lCHh$>Z==NR|_TEM%t8;I@NiqP1mT+5;bMTSgirWqb^m_Nu^rVU4N^z z<;7Ris_QznP1oPsmKp5Bv5QXn*xE+Brw*sMnz3$f6BU3T$Tp zBfHG3l)1iVgIvR%i6#$^q<_JHDGt?x+|AUBw_2Q?E2)tT^E*ftjj(xqk4~@;&NWp{ zrW2MX7&PWUlrg~*g$zs@Gj{Uip;YAdN1823v|;8MIJGxbvAd%+lpn+unaXm@UKjz9 z)_G%3b09GO|7R!M8+ss#Tqh5BQkyx33zl6HNqKn_oiS-z9IQ553V%VTF%GYm8%;(d zwj)L$WX9Vz`GCT((pQnndE-x^K(q^uYZemVvZ<7hhbn;l z{@y;7!y3EO&DFKKb*-J@NGW@6AXDUoAz|;IAjhDSi`4iR;pGkwRau*!4E`mX21=gw zG$yY{&z?p|V?Nmo(0{f2pC9%9-#=(IyVDTIvpiSB8rPAu4=y5^lEl7>d^Bh+n$i|~ zPZa6+=vc*Qtm*zII{L*k>C=0J3UokSy?!MikRCtOgWvpG6+V8L&y^309z~q@p02aL zf~}i*XneUCLtO9&0-}zE+y?pD&TgaU`5p!_^7h?36+nJ) z??CIeQi(nM$oP0q_s6@M{r5@(@)_yww6T|qLNHkzdm0Ns4|c@;qcO6tZ~p#` z4tDl5{_LsR%YV1Dt6KM_d+NwhhJz1w_jLxB}k>W-S|~^hK%#az(EJ?ID9v7{(&s0^fx0kg@T4vqD;( zwotp|Y6#Jl2l2<=5JhiI*641tW-=ATBo)u*>jGFEt$%)gtjT1eTZoas#QmQg=*{(| zhSMFL{Qhh0J^z(*z9&=|w=r|V5k_9b2&o=sk!xy8Bni(JYl`<#_|u8*AKcf5+^x=D z;zX-YPaeh6_u~9a|9Eqz#(G!fa0{bQN49Nc7+%3T7|LC<|D3`@>5WALc3^Kjwfl z1_hXTai!UJ-|Ob$okk@L&yfDQQsGhsVo?cZB7avh|Kp#!0f`pvrlkv{)W9u-Swi%&L4uqoo8kHD!I&a6HoW>P`ozPn1p{9VzVZ(vI+g#Y=QH=N!2#H}Pab diff --git a/GIGA/Common/Views/CustomSwitch/LXCustomSwith.h b/GIGA/Common/Views/CustomSwitch/LXCustomSwith.h new file mode 100644 index 0000000..8ffd2ff --- /dev/null +++ b/GIGA/Common/Views/CustomSwitch/LXCustomSwith.h @@ -0,0 +1,33 @@ +// +// LXCustomSwith.h +// CustomUISwitch +// +// Created by lianxiang on 2018/9/7. +// Copyright © 2018年 GIGA. All rights reserved. +// + +#import + +typedef NS_ENUM(NSInteger,LXCustomSwithShape){ + LXCustomSwithShapeNormal, + LXCustomSwithShapeRectangle, + LXCustomSwithShapeNoCorner +}; + +@interface LXCustomSwith : UIControl + +@property (nonatomic, getter = isOn) BOOL on; +@property (nonatomic, assign) LXCustomSwithShape shape; +@property (nonatomic, strong) UIColor *onTintColor; +@property (nonatomic, strong) UIColor *tintColor; +@property (nonatomic, strong) UIColor *thumbTintColor; +@property (nonatomic, assign) BOOL shadow; +@property (nonatomic, strong) UIColor *tintBorderColor; +@property (nonatomic, strong) UIColor *onTintBorderColor; +@property (nonatomic, strong) UILabel *onBackLabel;//打开时候的文字 +@property (nonatomic, strong) UILabel *offBackLabel;//关闭时候的文字 +@property (nonatomic, strong) UILabel *thumbLabel;// +@property (nonatomic,copy) NSString *onthumTitle; +@property (nonatomic,copy) NSString *offthumTitle; + +@end diff --git a/GIGA/Common/Views/CustomSwitch/LXCustomSwith.m b/GIGA/Common/Views/CustomSwitch/LXCustomSwith.m new file mode 100644 index 0000000..153efed --- /dev/null +++ b/GIGA/Common/Views/CustomSwitch/LXCustomSwith.m @@ -0,0 +1,403 @@ +// +// LXCustomSwith.m +// CustomUISwitch +// +// Created by lianxiang on 2018/9/7. +// Copyright © 2018年 GIGA. All rights reserved. +// + +#import "LXCustomSwith.h" +#import +#define VW(view) (view.frame.size.width) +#define VH(view) (view.frame.size.height) +static const CGFloat kAnimateDuration = 0.3f; +static const CGFloat kHorizontalAdjustment = 3.0f; +static const CGFloat kThumbShadowOpacity = 0.3f; +static const CGFloat kThumbShadowRadius = 0.5f; +static const CGFloat kSwitchBorderWidth = 1.75f; + +@interface LXCustomSwith() +@property (nonatomic, strong) UIView *onBackgroundView; +@property (nonatomic, strong) UIView *offBackgroundView; +@property (nonatomic, strong) UIView *thumbView; + + + +@end + +@implementation LXCustomSwith + +@synthesize onBackgroundView = _onBackgroundView; +@synthesize offBackgroundView = _offBackgroundView; +@synthesize thumbView = _thumbView; +@synthesize on = _on; +@synthesize shape = _shape; +@synthesize onTintColor = _onTintColor; +@synthesize tintColor = _tintColor; +@synthesize thumbTintColor = _thumbTintColor; +@synthesize shadow = _shadow; +@synthesize onTintBorderColor = _onTintBorderColor; +@synthesize tintBorderColor = _tintBorderColor; +@synthesize onBackLabel = _onBackLabel; +@synthesize offBackLabel = _offBackLabel; +@synthesize offthumTitle = _offthumTitle; +@synthesize onthumTitle = _onthumTitle; + +- (id)initWithFrame:(CGRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code + [self setupUI]; + } + return self; +} + +- (instancetype)initWithCoder:(NSCoder *)aDecoder{ + if (self = [super initWithCoder:aDecoder]) { + [self setupUI]; + } + return self; + +} + +- (void)setupUI +{ + + self.shape = LXCustomSwithShapeNormal; + + self.onBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; + //打开背景 + [self.onBackgroundView.layer setCornerRadius:self.frame.size.height/2]; + [self.onBackgroundView.layer setShouldRasterize:YES]; + [self.onBackgroundView.layer setRasterizationScale:[UIScreen mainScreen].scale]; + self.onBackgroundView.backgroundColor = [UIColor redColor]; + [self addSubview:self.onBackgroundView]; + + // 关闭 + self.offBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; + [self.offBackgroundView setBackgroundColor:[UIColor whiteColor]]; + [self.offBackgroundView.layer setCornerRadius:self.frame.size.height/2]; + [self.offBackgroundView.layer setShouldRasterize:YES]; + [self.offBackgroundView.layer setRasterizationScale:[UIScreen mainScreen].scale]; + [self addSubview:self.offBackgroundView]; + + self.thumbView = [[UIView alloc] init]; + [self.thumbView setUserInteractionEnabled:YES]; + [self.thumbView.layer setCornerRadius:(self.frame.size.height-kHorizontalAdjustment)/2]; + [self.thumbView.layer setShadowOffset:CGSizeMake(0, 1)]; + [self.thumbView.layer setShouldRasterize:YES]; + [self.thumbView.layer setShadowOpacity:kThumbShadowOpacity]; + [self.thumbView.layer setRasterizationScale:[UIScreen mainScreen].scale]; + self.thumbView.backgroundColor = [UIColor greenColor]; + [self addSubview:self.thumbView]; + + self.thumbLabel = [[UILabel alloc] init]; + self.thumbLabel.frame = CGRectMake(kHorizontalAdjustment, 0, self.frame.size.width, self.frame.size.height); + self.offthumTitle = @"关闭"; + self.thumbLabel.text = self.offthumTitle; + [self.thumbLabel sizeToFit]; + self.shadow = YES; + + + self.thumbView.frame = CGRectMake(0,0, self.thumbLabel.frame.size.width + self.frame.size.height, self.frame.size.height); + + self.thumbLabel.center = self.thumbView.center; + [self.thumbView addSubview:self.thumbLabel]; + + + // Default to OFF position + [self.thumbView setCenter:CGPointMake(self.thumbView.frame.size.width/2, self.frame.size.height/2)]; + + // Handle Thumb Tap Gesture + UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwitchTap:)]; + [tapGestureRecognizer setDelegate:self]; + [self.thumbView addGestureRecognizer:tapGestureRecognizer]; + // Handle Background Tap Gesture + UITapGestureRecognizer *tapBgGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleBgTap:)]; + [tapBgGestureRecognizer setDelegate:self]; + [self addGestureRecognizer:tapBgGestureRecognizer]; + // Handle Thumb Pan Gesture + UIPanGestureRecognizer *panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)]; + [panGestureRecognizer setDelegate:self]; + [self.thumbView addGestureRecognizer:panGestureRecognizer]; + [self setOn:NO]; +} + +- (void)layoutSubviews{ + [super layoutSubviews]; + [self updateFrame]; +} + +-(void)updateFrame{ + + self.thumbLabel.frame = CGRectMake(kHorizontalAdjustment, 0, self.frame.size.width, self.frame.size.height); + [self.thumbLabel sizeToFit]; + self.thumbView.frame = CGRectMake(0,0, self.thumbLabel.frame.size.width + self.frame.size.height - 10, self.frame.size.height); + self.thumbLabel.center = self.thumbView.center; +} + + +- (BOOL)isOn +{ + return _on; +} + +- (void)setOn:(BOOL)on +{ + if (_on != on) + _on = on; + + if (_on) + { + [self.onBackgroundView setAlpha:1.0]; + self.offBackgroundView.transform = CGAffineTransformMakeScale(0.0, 0.0); + + self.thumbView.center = CGPointMake(self.onBackgroundView.frame.size.width - (self.thumbView.frame.size.width+kHorizontalAdjustment)/2, self.thumbView.center.y); + self.thumbLabel.text = self.onthumTitle; + } + else + { + [self.onBackgroundView setAlpha:0.0]; + self.offBackgroundView.transform = CGAffineTransformMakeScale(1.0, 1.0); + + self.thumbView.center = CGPointMake((self.thumbView.frame.size.width+kHorizontalAdjustment)/2, self.thumbView.center.y); + self.thumbLabel.text = self.offthumTitle; + } +} + +- (void)setShadow:(BOOL)showShadow +{ + if (_shadow != showShadow) + _shadow = showShadow; + + if (showShadow) + { + [self.thumbView.layer setShadowOffset:CGSizeMake(0, 1)]; + [self.thumbView.layer setShadowRadius:kThumbShadowRadius]; + [self.thumbView.layer setShadowOpacity:kThumbShadowOpacity]; + } + else + { + [self.thumbView.layer setShadowRadius:0.0]; + [self.thumbView.layer setShadowOpacity:0.0]; + } +} + +- (void)setOnTintColor:(UIColor *)color +{ + if (_onTintColor != color) + _onTintColor = color; + + [self.onBackgroundView setBackgroundColor:color]; +} + +- (void)setOnTintBorderColor:(UIColor *)color +{ + if (_onTintBorderColor != color) + _onTintBorderColor = color; + + [self.onBackgroundView.layer setBorderColor:color.CGColor]; + + if (color) + [self.onBackgroundView.layer setBorderWidth:kSwitchBorderWidth]; + else + [self.onBackgroundView.layer setBorderWidth:0.0]; +} + +- (void)setTintColor:(UIColor *)color +{ + if (_tintColor != color) + _tintColor = color; + + [self.offBackgroundView setBackgroundColor:color]; +} + +- (void)setTintBorderColor:(UIColor *)color +{ + if (_tintBorderColor != color) + _tintBorderColor = color; + + [self.offBackgroundView.layer setBorderColor:color.CGColor]; + + if (color) + [self.offBackgroundView.layer setBorderWidth:kSwitchBorderWidth]; + else + [self.offBackgroundView.layer setBorderWidth:0.0]; +} + +- (void)setThumbTintColor:(UIColor *)color +{ + if (_thumbTintColor != color) + _thumbTintColor = color; + + [self.thumbView setBackgroundColor:color]; +} + +- (void)setOnthumTitle:(NSString *)onthumTitle{ + + _onthumTitle = onthumTitle; + +} + +- (void)setOffthumTitle:(NSString *)offthumTitle{ + + _offthumTitle = offthumTitle; + self.thumbLabel.text = self.offthumTitle; +} + +#pragma mark - Animation +- (void)animateToDestination:(CGPoint)centerPoint withDuration:(CGFloat)duration switch:(BOOL)on +{ + [UIView animateWithDuration:duration + delay:0.0f + options:UIViewAnimationOptionCurveEaseOut + animations:^{ + self.thumbView.center = centerPoint; + + if (on) + { + [self.onBackgroundView setAlpha:1.0]; + } + else + { + [self.onBackgroundView setAlpha:0.0]; + } + + } + completion:^(BOOL finished) { + if (finished) + { + [self updateSwitch:on]; + } + + }]; + + [UIView animateWithDuration:duration + delay:0.0f + options:UIViewAnimationOptionCurveEaseOut + animations:^{ + if (on) + { + //打开方式:加动画 + // self.offBackgroundView.transform = CGAffineTransformMakeScale(0.0, 0.0); + [self.offBackgroundView setAlpha:0.0]; + } + else + { + // self.offBackgroundView.transform = CGAffineTransformMakeScale(1.0, 1.0); + [self.offBackgroundView setAlpha:1.0]; + } + + } + completion:^(BOOL finished) { + }]; +} + + +#pragma mark - Gesture Recognizers +- (void)handlePan:(UIPanGestureRecognizer *)recognizer +{ + CGPoint translation = [recognizer translationInView:self.thumbView]; + + // Check the new center to see if within the boud + CGPoint newCenter = CGPointMake(recognizer.view.center.x + translation.x, + recognizer.view.center.y); + if (newCenter.x < (recognizer.view.frame.size.width+kHorizontalAdjustment)/2 || newCenter.x > self.onBackgroundView.frame.size.width-(recognizer.view.frame.size.width+kHorizontalAdjustment)/2) + { + // New center is Out of bound. Animate to left or right position + if(recognizer.state == UIGestureRecognizerStateBegan || + recognizer.state == UIGestureRecognizerStateChanged) + { + CGPoint velocity = [recognizer velocityInView:self.thumbView]; + + if (velocity.x >= 0) + { + // Animate move to right + [self animateToDestination:CGPointMake(self.onBackgroundView.frame.size.width - (self.thumbView.frame.size.width+kHorizontalAdjustment)/2, recognizer.view.center.y) withDuration:kAnimateDuration switch:YES]; + } + else + { + // Animate move to left + [self animateToDestination:CGPointMake((self.thumbView.frame.size.width+kHorizontalAdjustment)/2, recognizer.view.center.y) withDuration:kAnimateDuration switch:NO]; + } + + } + + return; + } + + // Only allow vertical pan + recognizer.view.center = CGPointMake(recognizer.view.center.x + translation.x, + recognizer.view.center.y); + [recognizer setTranslation:CGPointMake(0, 0) inView:self.thumbView]; + + CGPoint velocity = [recognizer velocityInView:self.thumbView]; + + if(recognizer.state == UIGestureRecognizerStateEnded) + { + if (velocity.x >= 0) + { + if (recognizer.view.center.x < self.onBackgroundView.frame.size.width - (self.thumbView.frame.size.width+kHorizontalAdjustment)/2) + { + // Animate move to right + [self animateToDestination:CGPointMake(self.onBackgroundView.frame.size.width - (self.thumbView.frame.size.width+kHorizontalAdjustment)/2, recognizer.view.center.y) withDuration:kAnimateDuration switch:YES]; + } + } + else + { + // Animate move to left + [self animateToDestination:CGPointMake((self.thumbView.frame.size.width+kHorizontalAdjustment)/2, recognizer.view.center.y) withDuration:kAnimateDuration switch:NO]; + } + } +} + +- (void)handleSwitchTap:(UIPanGestureRecognizer *)recognizer +{ + if (recognizer.state == UIGestureRecognizerStateEnded) + { + if (self.isOn) + { + // Animate move to left + [self animateToDestination:CGPointMake((self.thumbView.frame.size.width+kHorizontalAdjustment)/2, recognizer.view.center.y) withDuration:kAnimateDuration switch:NO]; + } + else + { + // Animate move to right + [self animateToDestination:CGPointMake(self.onBackgroundView.frame.size.width - (self.thumbView.frame.size.width+kHorizontalAdjustment)/2, recognizer.view.center.y) withDuration:kAnimateDuration switch:YES]; + } + } +} + +- (void)handleBgTap:(UITapGestureRecognizer *)recognizer +{ + if (recognizer.state == UIGestureRecognizerStateEnded) + { + if (self.isOn) + { + // Animate move to left + [self animateToDestination:CGPointMake((self.thumbView.frame.size.width+kHorizontalAdjustment)/2, self.thumbView.center.y) withDuration:kAnimateDuration switch:NO]; + } + else + { + // Animate move to right + [self animateToDestination:CGPointMake(self.onBackgroundView.frame.size.width - (self.thumbView.frame.size.width+kHorizontalAdjustment)/2, self.thumbView.center.y) withDuration:kAnimateDuration switch:YES]; + } + } +} + + +- (void)updateSwitch:(BOOL)on +{ + if (_on != on) _on = on; + if (_on) { + self.thumbLabel.text = self.onthumTitle; + }else{ + self.thumbLabel.text = self.offthumTitle; + } + + [self sendActionsForControlEvents:UIControlEventValueChanged]; +} + + +@end diff --git a/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.h b/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.h index 70446e4..071f5bb 100644 --- a/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.h +++ b/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.h @@ -7,7 +7,7 @@ // #import - -@interface GiGaAdDetailViewController : UIViewController +#import "GiGaBaseViewController.h" +@interface GiGaAdDetailViewController : GiGaBaseViewController @end diff --git a/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.m b/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.m index a4f79c4..efcb3ac 100644 --- a/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.m +++ b/GIGA/Modules/AppAD/GiGaAdDetailViewController/GiGaAdDetailViewController.m @@ -16,8 +16,10 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"广告详情"; + //self.title = @"广告详情"; + [self addNavTitile:@"广告详情"]; // Do any additional setup after loading the view. + } - (void)didReceiveMemoryWarning { diff --git a/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m b/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m index ff73de4..472f68c 100644 --- a/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m +++ b/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m @@ -14,6 +14,7 @@ #import "GiGaNetManager.h" #import "MBProgressHUD.h" #import "GiGaAttributedLabel.h" +#import "UINavigationBar+Custom.h" @interface GiGaRegistViewController () @property (weak, nonatomic) IBOutlet UITextField *phoneNumberTextField; @@ -42,14 +43,32 @@ [self.sendCodeBtn addTarget:self action:@selector(sendCodeBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [self.registBtn addTarget:self action:@selector(registBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [self.checkBtn addTarget:self action:@selector(checkBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - + + [self resetBackimg]; } +-(void)resetBackimg{ + UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + backBtn.frame = CGRectMake(0, 0, 40, 40); + [backBtn setImage:[UIImage imageNamed:@"nav_redback"] forState:UIControlStateNormal]; + [backBtn setImageEdgeInsets:UIEdgeInsetsMake(0,-14, 0, 14)]; + //backBtn.backgroundColor = [UIColor redColor]; + [backBtn addTarget:self action:@selector(backItemAction) forControlEvents:UIControlEventTouchUpInside]; + UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backBtn]; + self.navigationItem.leftBarButtonItem = backItem; +} +-(void)backItemAction{ + + [self.navigationController popViewControllerAnimated:YES]; +} -(void)viewDidAppear:(BOOL)animated{ [super viewDidAppear:animated]; +} +-(void)viewWillAppear:(BOOL)animated{ + [super viewWillAppear:animated]; + [self.navigationController.navigationBar setClearNav]; } - -(void)dealloc{ if (_timer) { [_timer unfireTimer]; @@ -114,8 +133,8 @@ -(void)confirmUI{ - self.useragreementLabel.highlightedTextColor = [UIColor lightGrayColor]; - self.useragreementLabel.textColor = GIGAUIColorFromRGBA(0x919191); + self.useragreementLabel.highlightedTextColor = GIGARGB(219, 23, 37, 1); + self.useragreementLabel.textColor = GIGARGB(145,145,145, 1); self.useragreementLabel.delegate = self; self.useragreementLabel.enabledTextCheckingTypes= NSTextCheckingTypePhoneNumber|NSTextCheckingTypeAddress|NSTextCheckingTypeLink; self.useragreementLabel.linkAttributes = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:(NSString *)kCTUnderlineStyleAttributeName]; @@ -130,7 +149,7 @@ [mutableAttributedString addAttribute:(NSString *)kCTFontAttributeName value:(__bridge id)font range:fontRange]; - [mutableAttributedString addAttribute:(NSString *)kCTForegroundColorAttributeName value:(__bridge id)[[UIColor colorWithRed:0/255.0 green:222/255.0 blue:189/255.0 alpha:1/1.0] CGColor] range:fontRange]; + [mutableAttributedString addAttribute:(NSString *)kCTForegroundColorAttributeName value:(__bridge id)[GIGARGB(219, 23, 37, 1) CGColor] range:fontRange]; } return mutableAttributedString; diff --git a/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.xib b/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.xib index dea3d3a..0dbd7a6 100644 --- a/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.xib +++ b/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.xib @@ -72,7 +72,7 @@ - + @@ -91,7 +91,7 @@ diff --git a/GIGA/Modules/LogIn/Controller/GiGaWebViewController.m b/GIGA/Modules/LogIn/Controller/GiGaWebViewController.m index 9dd0332..d1f5d8e 100644 --- a/GIGA/Modules/LogIn/Controller/GiGaWebViewController.m +++ b/GIGA/Modules/LogIn/Controller/GiGaWebViewController.m @@ -10,6 +10,8 @@ #import "NJKWebViewProgressView.h" #import "NJKWebViewProgress.h" #import "UIView+Toast.h" +#import "GiGaNavTitileView.h" + @interface GiGaWebViewController () { NJKWebViewProgressView *_progressView; @@ -17,11 +19,12 @@ } @property (weak, nonatomic) IBOutlet UIWebView *webview; - +@property (nonatomic,strong) GiGaNavTitileView *navTitleView; @end @implementation GiGaWebViewController + - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view from its nib. @@ -44,9 +47,12 @@ } -(void)viewWillAppear:(BOOL)animated{ + [super viewWillAppear:animated]; [self.navigationController.navigationBar addSubview:_progressView]; + } -(void)viewWillDisappear:(BOOL)animated{ + [super viewWillDisappear:animated]; [_progressView removeFromSuperview]; } -(void)loadWeb{ @@ -85,9 +91,21 @@ #pragma mark -NJKWebViewProgressDelegate -(void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress{ [_progressView setProgress:progress animated:YES]; - self.title = [_webview stringByEvaluatingJavaScriptFromString:@"document.title"]; - NSLog(@"%@",self.title); + NSString * title = [_webview stringByEvaluatingJavaScriptFromString:@"document.title"]; + //or + //[self addNavTitile:title]; + [self setnavTitle:title]; +} + +-(void)setnavTitle:(NSString *)title{ + if (!_navTitleView) { + _navTitleView = [[GiGaNavTitileView alloc] initWithFrame:CGRectMake(0, 0, 200, 44)]; + self.navigationItem.titleView = _navTitleView; + //[_navTitleView setTitleColor:[UIColor yellowColor]]; + } + + [_navTitleView setTitleStr:title]; } - (void)webViewDidStartLoad:(UIWebView *)webView{ diff --git a/GIGA/Modules/LogIn/Controller/PassWordResetVC.m b/GIGA/Modules/LogIn/Controller/PassWordResetVC.m index eaa5385..c7c0bc2 100644 --- a/GIGA/Modules/LogIn/Controller/PassWordResetVC.m +++ b/GIGA/Modules/LogIn/Controller/PassWordResetVC.m @@ -24,6 +24,7 @@ @implementation PassWordResetVC - (void)viewDidLoad { + [super viewDidLoad]; //self.title = @"重置密码"; [self addNavTitile:@"重置密码"]; @@ -31,6 +32,9 @@ _time = 60; [self.codeSendBtn addTarget:self action:@selector(codeSendBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [self.confirmBtn addTarget:self action:@selector(confirmBtnAction:) forControlEvents:UIControlEventTouchUpInside]; + + + } -(void)confirmUI{ diff --git a/GIGA/Modules/LogIn/Controller/PassWordResetVC.xib b/GIGA/Modules/LogIn/Controller/PassWordResetVC.xib index 05d6bd0..21f5a62 100644 --- a/GIGA/Modules/LogIn/Controller/PassWordResetVC.xib +++ b/GIGA/Modules/LogIn/Controller/PassWordResetVC.xib @@ -65,7 +65,7 @@ diff --git a/GIGA/Modules/Mask/Controller/GiGaFlingCommitVC.m b/GIGA/Modules/Mask/Controller/GiGaFlingCommitVC.m index d4c650d..e174917 100644 --- a/GIGA/Modules/Mask/Controller/GiGaFlingCommitVC.m +++ b/GIGA/Modules/Mask/Controller/GiGaFlingCommitVC.m @@ -15,18 +15,64 @@ #import "IQKeyboardManager.h" #import #import "NSString+Unicode.h" +#import "GIGAMBHUDHelper.h" +#import "LXCustomSwith.h" //弹幕控制器 @interface GiGaFlingCommitVC () @property (nonatomic,strong) GiGaFlyingCommitInputView *commitInputView; @property (nonatomic,strong) SocketIOClient *client; @property (nonatomic,strong) SocketManager *manager; - +@property (nonatomic,strong) LXCustomSwith *danmuSwitch; @end @implementation GiGaFlingCommitVC +- (LXCustomSwith *)danmuSwitch{ + if (!_danmuSwitch) { + _danmuSwitch = [[LXCustomSwith alloc] initWithFrame:CGRectMake(KMainW - 50 - 25 , 64 + PhoneX_TopMargin +10, 50, 18)]; + + [_danmuSwitch setOffthumTitle:@"弹幕"]; + [_danmuSwitch setOnthumTitle:@"弹幕"]; + [_danmuSwitch setOnTintColor:GIGARGB(91, 0, 2, 1)]; + [_danmuSwitch setTintColor:GIGARGB(91, 0, 2, 1)]; + [_danmuSwitch setThumbTintColor:GIGARGB(203, 42, 50, 1)]; + _danmuSwitch.on = YES; + _danmuSwitch.thumbLabel.font = GIGA_TEXTFONTMEDIUM(10); + _danmuSwitch.thumbLabel.textColor = [UIColor whiteColor]; + [_danmuSwitch addTarget:self action:@selector(mycuntomSwitchAction:) forControlEvents:UIControlEventValueChanged]; + } + + return _danmuSwitch; +} + +- (GiGaFlyingCommitInputView *)commitInputView{ + + if (!_commitInputView) { + _commitInputView = [[GiGaFlyingCommitInputView alloc] initWithFrame:self.view.bounds]; + [_commitInputView setPalceholderText:@"请输入弹幕"]; + } + return _commitInputView; +} + +//弹幕按钮 + +-(void)mycuntomSwitchAction:(id)sender{ + + LXCustomSwith *nkswitch = (LXCustomSwith *)sender; + if (nkswitch.isOn) + NSLog(@"switchPressed ON"); + else + [self.manager disconnectSocket:self.client]; + [self.manager disconnect]; + [self.client disconnect]; + self.client = nil; + self.manager = nil; + [self dismissViewControllerAnimated:YES completion:nil]; + NSLog(@"switchPressed OFF"); +} + -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; NC_ADD_TARGET_NAME_OBJECT(self, @selector(maskTimeEnd), kUserNoti_MASKEND, nil); @@ -46,9 +92,13 @@ [super viewDidLoad]; // Do any additional setup after loading the view. - [self.view addSubview: self.commitInputView]; - weakify(self); + [self.view addSubview: self.commitInputView]; + [self.view addSubview:self.danmuSwitch]; + [self.view bringSubviewToFront:self.danmuSwitch]; + + + weakify(self); self.commitInputView.SendCommentHandler = ^(NSString *content) { GILog(@"发送->:%@",content); NSArray *arr = @[@{ @@ -62,7 +112,6 @@ }; //开启弹幕 - [[LXDanMuManager shareInstance] createDanmuWithTrackSpeedArray:@[@1.00,@1.00,@3.00,@4.00] centerY:KMainH / 4 trackWidth:KMainW showInView:self.view]; [[LXDanMuManager shareInstance] start]; //socket @@ -73,26 +122,27 @@ -(void)connetction{ NSURL* url = [[NSURL alloc] initWithString:@"http://wsyts.s1.natapp.cc"]; -// NSDictionary* headers = @{@"EncodeUTF8":@YES}; - SocketManager *manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @NO, @"forcePolling": @YES,@"connectParams":@{@"token":@""},@"doubleEncodeUTF8":@YES}]; - + SocketManager *manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @NO, @"forcePolling": @YES,@"connectParams":@{@"token":@""}}]; _manager = manager; _client = manager.defaultSocket; - [self.manager connect]; + weakify(self); [self.client on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) { + GIGA_WIndowTost(@"客户端上线"); NSLog(@"*************\n\niOS客户端上线\n\n*************"); }]; [self.client on:@"connectedSocket" callback:^(NSArray * _Nonnull event, SocketAckEmitter * _Nonnull ack) { + [GIGAMBHUDHelper messageAddto:self.view title:@"弹幕链接成功"]; NSLog(@"connectedSocket:%@",event); + }]; - [self.client on:@"onTalk" callback:^(NSArray * _Nonnull envent, SocketAckEmitter * _Nonnull ack) { + [self.client on:@"onTalk" callback:^(NSArray * _Nonnull data, SocketAckEmitter * _Nonnull ack) { - NSString *json =envent[0]; + NSString *json =data[0]; NSLog(@"callback json***:%@",json); NSDictionary *dic = [GiGaHelper dictionaryWithJsonString:json]; @@ -105,11 +155,16 @@ } }]; + [self.client on:@"disconnect" callback:^(NSArray * _Nonnull event, SocketAckEmitter * _Nonnull ack) { + + GIGA_WIndowTost(@"客户端下线"); NSLog(@"*************\n\niOS客户端下线\n\n*************%@",event?event[0]:@""); }]; [self.client on:@"error" callback:^(NSArray * _Nonnull event, SocketAckEmitter * _Nonnull ack) { + + [GIGAMBHUDHelper messageAddto:self.view title:@"连接弹幕"]; // NSString *htmlString =event[0]; // htmlString = [self htmlEntityDecode:htmlString]; // @@ -119,17 +174,8 @@ // // NSLog(@"*************\n\n%@\n\n*************",event?event[0]:@""); GILog(@"请求超时"); - - }]; -} - -- (GiGaFlyingCommitInputView *)commitInputView{ - if (!_commitInputView) { - _commitInputView = [[GiGaFlyingCommitInputView alloc] initWithFrame:self.view.bounds]; - [_commitInputView setPalceholderText:@"请输入弹幕"]; - } - return _commitInputView; + }]; } @@ -156,13 +202,5 @@ NSLog(@"dealloc"); } -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event{ - [self.manager disconnectSocket:self.client]; - [self.manager disconnect]; - [self.client disconnect]; - self.client = nil; - self.manager = nil; - [self dismissViewControllerAnimated:YES completion:nil]; -} @end diff --git a/GIGA/Modules/Mask/Controller/GiGaMaskTaskViewController.m b/GIGA/Modules/Mask/Controller/GiGaMaskTaskViewController.m index 7da2025..24edc9d 100644 --- a/GIGA/Modules/Mask/Controller/GiGaMaskTaskViewController.m +++ b/GIGA/Modules/Mask/Controller/GiGaMaskTaskViewController.m @@ -81,7 +81,7 @@ if (!_cicleProgressView) { - _cicleProgressView = [[MaskTimeCircularProgressView alloc] initWithFrame:CGRectMake(100, 500, 136, 136) backColor:GIGARGB(22, 22, 22, 1) progressColor:[UIColor blueColor] lineWidth:10 timeinterval:10]; + _cicleProgressView = [[MaskTimeCircularProgressView alloc] initWithFrame:CGRectMake(100, 500, 136, 136) backColor:GIGARGB(88, 0, 2, 1) progressColor:[UIColor blueColor] lineWidth:10 timeinterval:10]; _cicleProgressView.delegate = self; _cicleProgressView.hidden = YES; @@ -133,7 +133,7 @@ return _waringView; } -//弹幕 +#pragma mark 弹幕 -(void)createInputView{ GiGaFlingCommitVC* GiGaFlingVC = [[GiGaFlingCommitVC alloc] init]; @@ -150,8 +150,10 @@ #pragma mark - 生命周期 -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; + } + -(void)viewDidAppear:(BOOL)animated{ [super viewDidAppear:animated]; if([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) { @@ -174,7 +176,7 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. - + self.automaticallyAdjustsScrollViewInsets = NO; [self setUpNav]; [self initUI]; [self addNotify]; @@ -207,7 +209,7 @@ [self.view layoutIfNeeded]; [UIView animateWithDuration:1.0 animations:^{ [self.maskImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.attachPoint.y - 87); + make.top.mas_equalTo(self.attachPoint.y - 87 + 4); }]; [self.faceView mas_updateConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.attachPoint.y -124); @@ -290,6 +292,7 @@ make.size.mas_equalTo(CGSizeMake(117, 25)); make.centerX.mas_equalTo(self.view.mas_centerX); }]; + //startTest [self.startTestButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view.mas_top).offset(486); @@ -297,25 +300,6 @@ make.centerX.mas_equalTo(self.view.mas_centerX); }]; - - -// UIButton *testBtn = [UIButton buttonWithType:UIButtonTypeCustom]; -// [testBtn setTitle:@"测试肤质" forState:UIControlStateNormal]; -// [testBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; -// testBtn.backgroundColor = [UIColor blueColor]; -// [testBtn addTarget:self action:@selector(testBtnAcion:) forControlEvents:UIControlEventTouchUpInside]; -// testBtn.layer.masksToBounds = YES; -// testBtn.layer.cornerRadius = 4; -// [self.view addSubview:testBtn]; -// -// [testBtn mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerX.mas_equalTo(self.view.mas_centerX); -// make.width.mas_equalTo(150); -// make.height.mas_equalTo(40); -// make.bottom.mas_equalTo(self.view.mas_bottom).offset(-130); -// }]; - - [self.view layoutIfNeeded]; CGFloat Y = CGRectGetMaxY(self.faceView.frame) + (CGRectGetMaxY(self.maskImageView.frame) - CGRectGetMaxY(self.faceView.frame)) / 2; CGFloat X = CGRectGetMidX(self.view.frame); @@ -374,11 +358,11 @@ MPMediaItemArtwork *arwork = [[MPMediaItemArtwork alloc] initWithImage:[UIImage imageNamed:@"MaskTime.png"]]; NSDictionary *dic = @{ MPMediaItemPropertyTitle:@"面膜时间", - MPMediaItemPropertyAlbumArtist:@"专辑专辑专辑专辑", - MPMediaItemPropertyArtist:@"lianxiang", - MPMediaItemPropertyAlbumTitle:@"hahah", + MPMediaItemPropertyAlbumArtist:@"面膜时间", + MPMediaItemPropertyArtist:@"敷膜中", + MPMediaItemPropertyAlbumTitle:@"敷膜中", MPMediaItemPropertyGenre:@"???", - MPMediaItemPropertyLyrics:@"歌词", + MPMediaItemPropertyLyrics:@"面膜", MPMediaItemPropertyPodcastTitle:@"PodcastTitle", MPMediaItemPropertyArtwork:arwork }; @@ -424,8 +408,8 @@ #pragma mark 开始测试 -(void)testBtnAcion:(UIButton *)btn{ - [self createInputView]; - return; +// [self createInputView]; +// return; BOOL isUserLogin = [GiGaUserDefault isUserLogin]; diff --git a/GIGA/Modules/Mask/View/GiGaFlyingCommitInputView.m b/GIGA/Modules/Mask/View/GiGaFlyingCommitInputView.m index 29ae811..0b0443c 100644 --- a/GIGA/Modules/Mask/View/GiGaFlyingCommitInputView.m +++ b/GIGA/Modules/Mask/View/GiGaFlyingCommitInputView.m @@ -7,6 +7,8 @@ // #import "GiGaFlyingCommitInputView.h" +static const CGFloat kInputViewH = 44.f; + @interface GiGaFlyingCommitInputView() @property(nonatomic,strong) UIView *commitInputView; @property(nonatomic,strong) UITextField * inputTextField; @@ -19,7 +21,7 @@ self = [super initWithFrame:frame]; if (self) { - self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1]; + //self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1]; UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(dismissSelfViewTap)]; [self addGestureRecognizer:tap]; @@ -32,28 +34,41 @@ -(void)creatInputView{ - UIView *commitView =[[UIView alloc] initWithFrame:CGRectMake(0, self.bounds.size.height - 60, self.bounds.size.width, 60)]; -// commitView.frame = CGRectMake(0, self.frame.size.height-commitView.frame.size.height, self.frame.size.width, commitView.frame.size.height); + UIView *commitView =[[UIView alloc] initWithFrame:CGRectMake(0, self.bounds.size.height - kInputViewH, self.bounds.size.width, kInputViewH)]; + self.commitInputView = commitView; - self.commitInputView.backgroundColor = [UIColor redColor]; + self.commitInputView.backgroundColor = GIGARGB(241, 241, 241, 1); [self addSubview:self.commitInputView]; UIButton *sendBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - CGFloat topMargin = 5; + CGFloat leftMargin = 10; - sendBtn.frame = CGRectMake(self.frame.size.width - leftMargin - 60,topMargin,60,40); + sendBtn.frame = CGRectMake(self.frame.size.width - leftMargin - 60,commitView.frame.size.height /2 - 20,60,40); [sendBtn addTarget:self action:@selector(sendBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - [sendBtn setTitle:@"发送" forState:UIControlStateNormal]; + //[sendBtn setTitle:@"发送" forState:UIControlStateNormal]; + [sendBtn setImage:[UIImage imageNamed:@"ic_send"] forState:UIControlStateNormal]; [sendBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - sendBtn.backgroundColor = [UIColor purpleColor]; sendBtn.layer.masksToBounds = YES; sendBtn.layer.cornerRadius = 4; [commitView addSubview:sendBtn]; - UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(10, 5,self.frame.size.width - sendBtn.frame.size.width - 10*2 - 5, 30)]; - textField.backgroundColor = [UIColor lightGrayColor]; + UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(44, commitView.frame.size.height /2 -15,self.frame.size.width - sendBtn.frame.size.width - 44 - 10 - leftMargin, 30)]; + textField.backgroundColor = [UIColor whiteColor]; + textField.placeholder = @"请输入弹幕"; + textField.layer.shadowColor = GIGARGB(190, 190, 190, 1).CGColor; + textField.layer.shadowOffset = CGSizeMake(5, 5); + textField.layer.shadowOpacity = 0.5; + textField.layer.shadowRadius = 4; + + textField.layer.masksToBounds = YES; + textField.layer.cornerRadius = 2; + textField.layer.borderWidth = 1; + textField.layer.borderColor = [UIColor whiteColor].CGColor; textField.clearButtonMode = UITextFieldViewModeWhileEditing; textField.delegate = self; textField.returnKeyType = UIReturnKeySend; + UIView *textLeftview = [[UIView alloc] initWithFrame:CGRectMake(0, 0,10, textField.frame.size.height)]; + textField.leftView = textLeftview; + textField.leftViewMode = UITextFieldViewModeAlways; [commitView addSubview:textField]; self.inputTextField = textField; @@ -155,7 +170,7 @@ - (void) keyboardWillHide:(NSNotification *)note { - self.commitInputView.frame = CGRectMake(0, self.bounds.size.height - 60, self.bounds.size.width, 60); + self.commitInputView.frame = CGRectMake(0, self.bounds.size.height - kInputViewH, self.bounds.size.width, kInputViewH); } - (void)dealloc diff --git a/GIGA/Modules/Mask/View/MaskTimeCircularProgressView.m b/GIGA/Modules/Mask/View/MaskTimeCircularProgressView.m index 6ddf4fa..720e60f 100644 --- a/GIGA/Modules/Mask/View/MaskTimeCircularProgressView.m +++ b/GIGA/Modules/Mask/View/MaskTimeCircularProgressView.m @@ -78,7 +78,6 @@ _countLabel.outLineColor = [UIColor whiteColor]; _countLabel.blurColor = [UIColor whiteColor]; _countLabel.oinsideColor = [UIColor whiteColor]; - _countLabel.text = @"00:00"; _countLabel.font = [UIFont fontWithName:GIGA_FONTBOLD size:22]; } @@ -86,6 +85,7 @@ } - (void)setLineWidth:(CGFloat)lineWidth{ + CAShapeLayer *backgroundLayer = [self createRingLayerWithCenter:CGPointMake(CGRectGetWidth(self.frame) / 2, CGRectGetHeight(self.frame) / 2) radius:CGRectGetWidth(self.bounds) / 2 - lineWidth / 2 lineWidth:lineWidth color:self.backColor]; _lineWidth = lineWidth; [self.layer addSublayer:backgroundLayer]; @@ -102,7 +102,7 @@ CAGradientLayer *gradientLayer1 = [CAGradientLayer layer]; gradientLayer1.frame = CGRectMake(0, 0, width, height); - gradientLayer1.colors = @[(__bridge id) [UIColor colorWithRed:151/255.0 green:253/255.0 blue:255/255.0 alpha:1/1.0].CGColor,(__bridge id)[UIColor colorWithRed:165/255.0 green:81/255.0 blue:216/255.0 alpha:1/1.0].CGColor]; + gradientLayer1.colors = @[(__bridge id) [UIColor colorWithRed:255/255.0 green:107/255.0 blue:107/255.0 alpha:1/1.0].CGColor,(__bridge id)[UIColor colorWithRed:187/255.0 green:79/255.0 blue:253/255.0 alpha:1/1.0].CGColor]; //纵向变化 gradientLayer1.startPoint = CGPointMake(0.5, 0);