diff --git a/GIGA.xcodeproj/project.pbxproj b/GIGA.xcodeproj/project.pbxproj index 551473d..9663035 100644 --- a/GIGA.xcodeproj/project.pbxproj +++ b/GIGA.xcodeproj/project.pbxproj @@ -12,6 +12,9 @@ 83048486214FACE700603CE7 /* JobMaskButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 83048485214FACE700603CE7 /* JobMaskButton.m */; }; 8314D2112133ABE500B458BF /* WeiIXinApiManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8314D2102133ABE500B458BF /* WeiIXinApiManager.m */; }; 83276187216F29A800C6216C /* LXCustomActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 83276185216F29A800C6216C /* LXCustomActionSheet.m */; }; + 83319C852174376C005EF726 /* AppDelegate+ThirdParty.m in Sources */ = {isa = PBXBuildFile; fileRef = 83319C812174376B005EF726 /* AppDelegate+ThirdParty.m */; }; + 83319C862174376C005EF726 /* AppDelegate+GiGaConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 83319C822174376C005EF726 /* AppDelegate+GiGaConfig.m */; }; + 83319C87217437E0005EF726 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8361B3CA212155C200238FEB /* AppDelegate.m */; }; 83346AC0212BB50A0054D597 /* PassWordResetVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 83346ABE212BB50A0054D597 /* PassWordResetVC.m */; }; 83346AC1212BB50A0054D597 /* PassWordResetVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83346ABF212BB50A0054D597 /* PassWordResetVC.xib */; }; 83346AC5212BBC8C0054D597 /* GiGaRegistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83346AC3212BBC8C0054D597 /* GiGaRegistViewController.m */; }; @@ -20,6 +23,8 @@ 83346ACF212BD7830054D597 /* GiGaWebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83346ACD212BD7830054D597 /* GiGaWebViewController.xib */; }; 83346AD4212BFF6E0054D597 /* UserGuardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83346AD3212BFF6E0054D597 /* UserGuardViewController.m */; }; 83346AD7212C18F50054D597 /* GiGaAppGaurdVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 83346AD6212C18F50054D597 /* GiGaAppGaurdVC.m */; }; + 83379D0B217033A800986278 /* GiGaLoaclImageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 83379D0A217033A800986278 /* GiGaLoaclImageModel.m */; }; + 83379D0E21703CC100986278 /* GIGaSharePageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83379D0D21703CC100986278 /* GIGaSharePageViewController.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 */; }; @@ -45,13 +50,11 @@ 834415F3215B5F8200A6D906 /* GiGaShareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 834415F2215B5F8200A6D906 /* GiGaShareModel.m */; }; 834415F6215B89A300A6D906 /* MaskTimeTopAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 834415F5215B89A300A6D906 /* MaskTimeTopAnimationView.m */; }; 8345C13621414D3B00051717 /* NSString+Unicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 8345C13521414D3B00051717 /* NSString+Unicode.m */; }; - 8349585C212511040064DB6C /* AppDelegate+ThirdParty.m in Sources */ = {isa = PBXBuildFile; fileRef = 8349585B212511040064DB6C /* AppDelegate+ThirdParty.m */; }; 834BDA48215C7D10001E1DB7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 834BDA47215C7D0F001E1DB7 /* InfoPlist.strings */; }; 834DA5A5215F5F3B003FC4C6 /* ShareViewSystemImageHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 834DA5A4215F5F3B003FC4C6 /* ShareViewSystemImageHelper.m */; }; 834DA5A8215F5FE0003FC4C6 /* ShareCustomIamgeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 834DA5A7215F5FE0003FC4C6 /* ShareCustomIamgeModel.m */; }; 834DA5AB215F6840003FC4C6 /* JobModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 834DA5AA215F6840003FC4C6 /* JobModel.m */; }; 835060A2212D1225007E6220 /* GiGaMeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060A1212D1225007E6220 /* GiGaMeViewController.m */; }; - 835060A5212D3536007E6220 /* AppDelegate+GiGaConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8361B40A21217B2100238FEB /* AppDelegate+GiGaConfig.m */; }; 835060A9212D38EE007E6220 /* GiGaStartAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060A8212D38EE007E6220 /* GiGaStartAdView.m */; }; 835060AD212D4D0C007E6220 /* GiGaFileNanager.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060AC212D4D0C007E6220 /* GiGaFileNanager.m */; }; 835060B3212D54C2007E6220 /* GiGaAdDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060B2212D54C2007E6220 /* GiGaAdDetailViewController.m */; }; @@ -74,7 +77,6 @@ 8357ADD82124027D000816F2 /* GiGaUserDefault.m in Sources */ = {isa = PBXBuildFile; fileRef = 8357ADD72124027D000816F2 /* GiGaUserDefault.m */; }; 835A0EAC216AF03C00ABAB1C /* GiGaPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 835A0EAB216AF03C00ABAB1C /* GiGaPageControl.m */; }; 835A0EAF216AFDC300ABAB1C /* LXPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 835A0EAE216AFDC300ABAB1C /* LXPageControl.m */; }; - 8361B3CB212155C200238FEB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8361B3CA212155C200238FEB /* AppDelegate.m */; }; 8361B3CE212155C200238FEB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8361B3CD212155C200238FEB /* ViewController.m */; }; 8361B3D1212155C200238FEB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8361B3CF212155C200238FEB /* Main.storyboard */; }; 8361B3D3212155C300238FEB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8361B3D2212155C300238FEB /* Assets.xcassets */; }; @@ -274,6 +276,10 @@ 8314D2122133F44600B458BF /* MobClickList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MobClickList.h; sourceTree = ""; }; 83276185216F29A800C6216C /* LXCustomActionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXCustomActionSheet.m; sourceTree = ""; }; 83276186216F29A800C6216C /* LXCustomActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCustomActionSheet.h; sourceTree = ""; }; + 83319C812174376B005EF726 /* AppDelegate+ThirdParty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+ThirdParty.m"; sourceTree = ""; }; + 83319C822174376C005EF726 /* AppDelegate+GiGaConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+GiGaConfig.m"; sourceTree = ""; }; + 83319C832174376C005EF726 /* AppDelegate+GiGaConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+GiGaConfig.h"; sourceTree = ""; }; + 83319C842174376C005EF726 /* AppDelegate+ThirdParty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+ThirdParty.h"; sourceTree = ""; }; 83346ABD212BB50A0054D597 /* PassWordResetVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PassWordResetVC.h; sourceTree = ""; }; 83346ABE212BB50A0054D597 /* PassWordResetVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PassWordResetVC.m; sourceTree = ""; }; 83346ABF212BB50A0054D597 /* PassWordResetVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PassWordResetVC.xib; sourceTree = ""; }; @@ -287,6 +293,10 @@ 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 = ""; }; + 83379D09217033A800986278 /* GiGaLoaclImageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaLoaclImageModel.h; sourceTree = ""; }; + 83379D0A217033A800986278 /* GiGaLoaclImageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaLoaclImageModel.m; sourceTree = ""; }; + 83379D0C21703CC100986278 /* GIGaSharePageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaSharePageViewController.h; sourceTree = ""; }; + 83379D0D21703CC100986278 /* GIGaSharePageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GIGaSharePageViewController.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 = ""; }; @@ -330,8 +340,6 @@ 834415F5215B89A300A6D906 /* MaskTimeTopAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaskTimeTopAnimationView.m; sourceTree = ""; }; 8345C13421414D3B00051717 /* NSString+Unicode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Unicode.h"; sourceTree = ""; }; 8345C13521414D3B00051717 /* NSString+Unicode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Unicode.m"; sourceTree = ""; }; - 8349585A212511040064DB6C /* AppDelegate+ThirdParty.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+ThirdParty.h"; sourceTree = ""; }; - 8349585B212511040064DB6C /* AppDelegate+ThirdParty.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+ThirdParty.m"; sourceTree = ""; }; 834BDA47215C7D0F001E1DB7 /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = ""; }; 834DA5A3215F5F3B003FC4C6 /* ShareViewSystemImageHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareViewSystemImageHelper.h; sourceTree = ""; }; 834DA5A4215F5F3B003FC4C6 /* ShareViewSystemImageHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareViewSystemImageHelper.m; sourceTree = ""; }; @@ -403,8 +411,6 @@ 8361B40321215E0C00238FEB /* LXCountTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCountTimer.h; sourceTree = ""; }; 8361B40521215E6F00238FEB /* GiGaHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaHelper.h; sourceTree = ""; }; 8361B40621215E6F00238FEB /* GiGaHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaHelper.m; sourceTree = ""; }; - 8361B40921217B2100238FEB /* AppDelegate+GiGaConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+GiGaConfig.h"; sourceTree = ""; }; - 8361B40A21217B2100238FEB /* AppDelegate+GiGaConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+GiGaConfig.m"; sourceTree = ""; }; 8361B40C21217C8200238FEB /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 8361B40E21217C9100238FEB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 8361B41021217CA100238FEB /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; @@ -878,6 +884,8 @@ 8376B8352154C74300AB79F8 /* ShareViewController.m */, 834DA5A3215F5F3B003FC4C6 /* ShareViewSystemImageHelper.h */, 834DA5A4215F5F3B003FC4C6 /* ShareViewSystemImageHelper.m */, + 83379D0C21703CC100986278 /* GIGaSharePageViewController.h */, + 83379D0D21703CC100986278 /* GIGaSharePageViewController.m */, ); path = Controller; sourceTree = ""; @@ -891,6 +899,8 @@ 834415F2215B5F8200A6D906 /* GiGaShareModel.m */, 834DA5A6215F5FE0003FC4C6 /* ShareCustomIamgeModel.h */, 834DA5A7215F5FE0003FC4C6 /* ShareCustomIamgeModel.m */, + 83379D09217033A800986278 /* GiGaLoaclImageModel.h */, + 83379D0A217033A800986278 /* GiGaLoaclImageModel.m */, ); path = Model; sourceTree = ""; @@ -971,6 +981,10 @@ 8361B3C8212155C200238FEB /* GIGA */ = { isa = PBXGroup; children = ( + 83319C832174376C005EF726 /* AppDelegate+GiGaConfig.h */, + 83319C822174376C005EF726 /* AppDelegate+GiGaConfig.m */, + 83319C842174376C005EF726 /* AppDelegate+ThirdParty.h */, + 83319C812174376B005EF726 /* AppDelegate+ThirdParty.m */, 835060A3212D2321007E6220 /* GIGA.entitlements */, 8361B3FF21215C9D00238FEB /* Modules */, 8361B3FE21215C8A00238FEB /* Category */, @@ -978,10 +992,6 @@ 8361B3FC21215C7400238FEB /* Common */, 8361B3C9212155C200238FEB /* AppDelegate.h */, 8361B3CA212155C200238FEB /* AppDelegate.m */, - 8361B40921217B2100238FEB /* AppDelegate+GiGaConfig.h */, - 8361B40A21217B2100238FEB /* AppDelegate+GiGaConfig.m */, - 8349585A212511040064DB6C /* AppDelegate+ThirdParty.h */, - 8349585B212511040064DB6C /* AppDelegate+ThirdParty.m */, 8361B3CC212155C200238FEB /* ViewController.h */, 8361B3CD212155C200238FEB /* ViewController.m */, 8361B3CF212155C200238FEB /* Main.storyboard */, @@ -1970,13 +1980,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 83319C87217437E0005EF726 /* AppDelegate.m in Sources */, 835060AD212D4D0C007E6220 /* GiGaFileNanager.m in Sources */, 8382DFF621564A1F00BBA5A5 /* SJPhotoPickerToolBar.m in Sources */, 83846441214A4BFF00F12B33 /* MaskTestResultVC.m in Sources */, 83346AC5212BBC8C0054D597 /* GiGaRegistViewController.m in Sources */, 83346AD7212C18F50054D597 /* GiGaAppGaurdVC.m in Sources */, 8351474B21523B7400B25A88 /* GIGaUserChangeMobleCell.m in Sources */, - 8349585C212511040064DB6C /* AppDelegate+ThirdParty.m in Sources */, 83048481214F489000603CE7 /* GiGaUserJobViewCell.m in Sources */, 8376B83B2154CE8C00AB79F8 /* MaskTimeShareViewCell.m in Sources */, 83BFAE73213CDB58004EF801 /* GiSysSettingsVC.m in Sources */, @@ -1987,6 +1997,7 @@ 834415EF215B52EF00A6D906 /* MaskTestNODataViewCell.m in Sources */, 8382DFF321564A1F00BBA5A5 /* SJPreviewPhotoCell.m in Sources */, 8314D2112133ABE500B458BF /* WeiIXinApiManager.m in Sources */, + 83379D0E21703CC100986278 /* GIGaSharePageViewController.m in Sources */, 83BDC0582147B89900E74E0D /* GiGaAnswerViewCell.m in Sources */, 83BC8A862148BE8A00820437 /* NYSliderPopover.m in Sources */, 83773FC52147A5CC0014EE4C /* MaskQuestionView.m in Sources */, @@ -2006,6 +2017,7 @@ 83BC8A8A2148D28300820437 /* QustionAnswer.m in Sources */, 8342FD7D2150F94600D141F4 /* AppVerionDescriptionVC.m in Sources */, 8357ADC92123BFCA000816F2 /* GiGaUserManager.m in Sources */, + 83379D0B217033A800986278 /* GiGaLoaclImageModel.m in Sources */, 8390116F214E20B2004CA790 /* LYSDatePickerViewController.m in Sources */, 8351473C215215C500B25A88 /* GiGAUserInfoCell.m in Sources */, 8384F0E821533528002C19F0 /* MaskResultPercentCell.m in Sources */, @@ -2054,6 +2066,7 @@ 833DA7762122A62000A5C614 /* GiGaMaskTaskViewController.m in Sources */, 836EE5D7213645E300F0ABB2 /* GiGaBaseAPiRequest.m in Sources */, 8376B8232154927300AB79F8 /* GIGaMaskShareViewController.m in Sources */, + 83319C852174376C005EF726 /* AppDelegate+ThirdParty.m in Sources */, 83773FBC214769230014EE4C /* ExercisesModel.m in Sources */, 8384F0EE2153355A002C19F0 /* MaskResultShareViewCell.m in Sources */, 8376B8452154CEC800AB79F8 /* MaskShareBoootomViewCell.m in Sources */, @@ -2065,7 +2078,6 @@ 83901179214E20B2004CA790 /* LYSDatePickerTypeBase.m in Sources */, 835060A2212D1225007E6220 /* GiGaMeViewController.m in Sources */, 83C78A192159D74D0083DDD9 /* UIImage+LogoQrCode.m in Sources */, - 8361B3CB212155C200238FEB /* AppDelegate.m in Sources */, 8382DFB92156389200BBA5A5 /* GIGaFeedImagsCollectionCell.m in Sources */, 8351474621521CC500B25A88 /* GiGaChangePhoneNumberVC.m in Sources */, 838388C8212F9C4200D14C53 /* GiGaLocalNotificationManager.m in Sources */, @@ -2107,12 +2119,12 @@ 83E40B2F21218BA0008149C4 /* GiGaUserViewController.m in Sources */, 8382DFE721564A1F00BBA5A5 /* SJPhotoPicker.m in Sources */, 83901170214E20B2004CA790 /* LYSDateHeaderViewController.m in Sources */, - 835060A5212D3536007E6220 /* AppDelegate+GiGaConfig.m in Sources */, 835147312151E4EF00B25A88 /* GIGaAboutUsVC.m in Sources */, 8376B8282154A0A200AB79F8 /* MaskTimeEndViewImgaeCell.m in Sources */, 83901174214E20B2004CA790 /* LYSDateIndicatorViewController.m in Sources */, 8390117B214E20B2004CA790 /* LYSDatePickerHeaderView.m in Sources */, 838762E7214B9FA60039D241 /* GIGaUserCityViewCell.m in Sources */, + 83319C862174376C005EF726 /* AppDelegate+GiGaConfig.m in Sources */, 8342FD822150FA1500D141F4 /* AppVersionDescCell.m in Sources */, 834DA5AB215F6840003FC4C6 /* JobModel.m in Sources */, 83BFAE77213CDE91004EF801 /* GiGaSettingsViewCell.m in Sources */, @@ -2328,10 +2340,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/GIGA/Common/libs/ZbarSDK/ZBarSDK", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.gigamask.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -2362,10 +2371,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/GIGA/Common/libs/ZbarSDK/ZBarSDK", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.gigamask.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; diff --git a/GIGA.xcworkspace/xcuserdata/lianxiang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/GIGA.xcworkspace/xcuserdata/lianxiang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ed9a9b4..74854be 100644 --- a/GIGA.xcworkspace/xcuserdata/lianxiang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/GIGA.xcworkspace/xcuserdata/lianxiang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,4 +2,22 @@ + + + + + + diff --git a/GIGA/AppDelegate+Config.h b/GIGA/AppDelegate+Config.h deleted file mode 100644 index 5267cd5..0000000 --- a/GIGA/AppDelegate+Config.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// AppDelegate+Config.h -// GIGA -// -// Created by lianxiang on 2018/8/13. -// Copyright © 2018年 com.giga.ios. All rights reserved. -// - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end diff --git a/GIGA/AppDelegate.m b/GIGA/AppDelegate.m index 5abdacc..180fe85 100644 --- a/GIGA/AppDelegate.m +++ b/GIGA/AppDelegate.m @@ -52,7 +52,23 @@ } }]; } - + + if ([[UIApplication sharedApplication] backgroundRefreshStatus] != UIBackgroundRefreshStatusAvailable ) { + [self.window.rootViewController jxt_showAlertWithTitle:@"温馨提示" message:@"为保证您正常使用面膜时间，需要您开启后台刷新，请在 设置->面膜时间->应用程序后台刷新 开启" appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) { + alertMaker.addActionCancelTitle(@"下次"); + alertMaker.addActionDefaultTitle(@"去开启"); + + } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) { + if (buttonIndex == 1) { + + NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + if ([[UIApplication sharedApplication] canOpenURL:url]) { + [[UIApplication sharedApplication] openURL:url]; + } + } + + }]; + } return YES; } diff --git a/GIGA/Common/GiGaLocalNotificationManager/GiGaLocalNotificationManager.m b/GIGA/Common/GiGaLocalNotificationManager/GiGaLocalNotificationManager.m index 71fc8aa..521528c 100644 --- a/GIGA/Common/GiGaLocalNotificationManager/GiGaLocalNotificationManager.m +++ b/GIGA/Common/GiGaLocalNotificationManager/GiGaLocalNotificationManager.m @@ -125,7 +125,7 @@ API_AVAILABLE(ios(10.0)){ // 判断为本地通知 NSLog(@"iOS10 前台 收到本地通知:{\\\\nbody:%@，\\\\ntitle:%@,\\\\nsubtitle:%@,\\\\nbadge：%@，\\\\nsound：%@，\\\\nuserInfo：%@\\\\n}",body,title,subtitle,badge,sound,userInfo); - [self showAlert:title message:body]; + //[self showAlert:title message:body]; [center removeAllPendingNotificationRequests]; } completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert); diff --git a/GIGA/Common/GiGaUserDB/GiGaUserDefault.m b/GIGA/Common/GiGaUserDB/GiGaUserDefault.m index 550fb41..4882030 100644 --- a/GIGA/Common/GiGaUserDB/GiGaUserDefault.m +++ b/GIGA/Common/GiGaUserDB/GiGaUserDefault.m @@ -145,11 +145,11 @@ NSString *const kShowUserTested = @"kShowUserTested"; NSTimeInterval time = [UD_STADARDUD doubleForKey:kMaskeTime]; if (time == 0) { - //默认15 分钟 - time = 15 * 60; + //默认17.5 分钟 + time = 17.5 * 60; //time = MASKTIME_DEFAULT; } - time = 5; + //time = 5; return time; } diff --git a/GIGA/Common/GiGaUserDB/GiGaUserManager.m b/GIGA/Common/GiGaUserDB/GiGaUserManager.m index dc8f8db..82861e3 100644 --- a/GIGA/Common/GiGaUserDB/GiGaUserManager.m +++ b/GIGA/Common/GiGaUserDB/GiGaUserManager.m @@ -96,6 +96,10 @@ const static NSInteger GIGADB_USER_VER = 0;//当前数据库版本号 [_store putObject:_userArr withId:userTableId intoTable:GIGA_USER_TABLE]; [GiGaUserDefault saveUserId:userTableId]; + if (user.minute != 0) { + [GiGaUserDefault savaMaskeTime:user.minute * 60]; + } + } //已登录 diff --git a/GIGA/Common/Views/LXCustomActionsheet/LXCustomActionSheet.m b/GIGA/Common/Views/LXCustomActionsheet/LXCustomActionSheet.m index 82082bc..9e4f959 100644 --- a/GIGA/Common/Views/LXCustomActionsheet/LXCustomActionSheet.m +++ b/GIGA/Common/Views/LXCustomActionsheet/LXCustomActionSheet.m @@ -84,7 +84,7 @@ titleLabe.frame = tabHeader.bounds; titleLabe.textAlignment = NSTextAlignmentCenter; titleLabe.text = self.title; - titleLabe.font = GIGA_TEXTFONTMEDIUM(12); + titleLabe.font = GIGA_TEXTFONTMEDIUM(15); titleLabe.textColor = GIGA_MAIN_BGCOLOR; [tabHeader addSubview:titleLabe]; UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(0, tabHeader.frame.size.height -0.5, Screen_Width, 0.5)]; @@ -110,7 +110,7 @@ - (UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Navi_Cell"]; - cell.textLabel.font = GIGA_TEXTFONTMEDIUM(15); + cell.textLabel.font = GIGA_TEXTFONTMEDIUM(18); cell.textLabel.textColor = GIGA_MAIN_BGCOLOR; if (indexPath.section == 0) { cell.textLabel.text = _optionsArr[indexPath.row]; diff --git a/GIGA/Config/ApiRequestConfig.h b/GIGA/Config/ApiRequestConfig.h index 2777f3c..3637c5b 100644 --- a/GIGA/Config/ApiRequestConfig.h +++ b/GIGA/Config/ApiRequestConfig.h @@ -41,7 +41,9 @@ #define kApiVersifyPhoneCode @"user/v1/validateSmsCode" //注册发送短信 #define kApiUserRegistSendCode @"msg/sms/v1/registersendcode" - +//手机登录 获取验证码 +#define kApiIUserLoginSendCode @"msg/sms/v1/sendcode" +#define kApiUserloginWithSMSCode @"sys/v1/mobilecodelogin" //获取意见反馈类型 （设置意见反馈） #define kApiGetFeedList @"sys/sysdict/v1/maskproposaltype" diff --git a/GIGA/Config/GiGaServerConfig.m b/GIGA/Config/GiGaServerConfig.m index d29c0f7..8cabb0c 100644 --- a/GIGA/Config/GiGaServerConfig.m +++ b/GIGA/Config/GiGaServerConfig.m @@ -18,11 +18,12 @@ switch (type) { case 0://测试环境 { -// [[NSUserDefaults standardUserDefaults] setValue:@"http://apiyts.s1.natapp.cc/v1/" forKey:@"MainUrl"]; -// [[NSUserDefaults standardUserDefaults] setValue:@"http://wsyts.s1.natapp.cc" forKey:@"gigasocketUrl"]; - [[NSUserDefaults standardUserDefaults] setValue:@"https://api.mianmoshijian.com/v1/" forKey:@"MainUrl"]; - [[NSUserDefaults standardUserDefaults] setValue:@"https://ws.mianmoshijian.com" forKey:@"gigasocketUrl"]; + [[NSUserDefaults standardUserDefaults] setValue:@"http://apiyts.s1.natapp.cc/v1/" forKey:@"MainUrl"]; + [[NSUserDefaults standardUserDefaults] setValue:@"http://wsyts.s1.natapp.cc" forKey:@"gigasocketUrl"]; +// [[NSUserDefaults standardUserDefaults] setValue:@"https://api.mianmoshijian.com/v1/" forKey:@"MainUrl"]; +// [[NSUserDefaults standardUserDefaults] setValue:@"https://ws.mianmoshijian.com" forKey:@"gigasocketUrl"]; +// } break; case 1: //生产环境 diff --git a/GIGA/GIGA.pch b/GIGA/GIGA.pch index 473f552..64de169 100644 --- a/GIGA/GIGA.pch +++ b/GIGA/GIGA.pch @@ -26,11 +26,11 @@ #import "GIGA.h" //#import "AFNetworking.h" //#import + #import "UIView+Toast.h" #import "JXTAlertManagerHeader.h" #import "Masonry.h" #import "GiGaHelper.h" - #import "MobClickList.h" #import "TTTAttributedLabel.h" #import "GiGaUserManager.h" diff --git a/GIGA/Info.plist b/GIGA/Info.plist index ec5d362..c39d2e1 100644 --- a/GIGA/Info.plist +++ b/GIGA/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.0 + 0.9.5 CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 1.6.1 + 1.6.3 LSApplicationQueriesSchemes weixin diff --git a/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m b/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m index 553ca0e..ff22828 100644 --- a/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m +++ b/GIGA/Modules/LogIn/Controller/GiGaRegistViewController.m @@ -136,7 +136,11 @@ [MBProgressHUD hideHUDForView:self.view animated:YES]; GILog(@"短信获取%@",result.message); if (result.success) { + [self startTimer:btn]; + + }else{ + GIGA_ShowToast(result.message); } }]; diff --git a/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.m b/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.m index 500421c..1283c25 100644 --- a/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.m +++ b/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.m @@ -20,10 +20,12 @@ #import "GIGAMBHUDHelper.h" #import "GiGaHelper.h" #import "GiGaUserManager.h" +#import "NSTimer+Convenience.h" @interface GiGaUserLoginVC () @property (weak, nonatomic) IBOutlet UIImageView *userImagView; @property (weak, nonatomic) IBOutlet UITextField *acountTextField; +//0.9+ 改成code @property (weak, nonatomic) IBOutlet UITextField *passwordTextField; @property (weak, nonatomic) IBOutlet UIButton *loginBtn; @@ -31,6 +33,8 @@ @property (weak, nonatomic) IBOutlet UIButton *registBtn; @property (weak, nonatomic) IBOutlet UIButton *secretBtn; +@property(nonatomic,strong) NSTimer*timer; +@property(nonatomic) NSInteger time; @end @@ -38,7 +42,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - + _time = 60; if (@available(iOS 11.0, *)) { self.backScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } else { @@ -96,8 +100,9 @@ // NSAttributedString *passholderText = [[NSAttributedString alloc] initWithString:@"密码" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:[UIColor redColor]}]; // self.passwordTextField.attributedPlaceholder = passholderText; UIView *passView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; - UIImageView *passViewIcon = [[UIImageView alloc] initWithFrame:CGRectMake(15,8, 12, 22)]; - passViewIcon.image = [UIImage imageNamed:@"icon_key"]; + UIImageView *passViewIcon = [[UIImageView alloc] initWithFrame:CGRectMake(12,13.5, 18, 13)]; + + passViewIcon.image = [UIImage imageNamed:@"ic_note"]; [passView addSubview:passViewIcon]; self.passwordTextField.leftView = passView; self.passwordTextField.leftViewMode = UITextFieldViewModeAlways; @@ -158,7 +163,7 @@ } - #pragma mark 手机号登录 + #pragma mark 手机号登录 验证码登录 -(void)loginBtnAction:(UIButton *)btn{ if (self.acountTextField.text.length == 0) { @@ -174,56 +179,51 @@ GIGA_ShowToast(@"密码不能为空"); return; } -// BOOL isPass = [GiGaHelper checkPassWord:self.passwordTextField.text]; -// -// if (isPass == NO) { -// GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码"); -// return; -// } - int leng = [GiGaHelper convertToInt: self.passwordTextField.text]; - - if (!(leng >= 6 && leng <= 20)) { - GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码"); + if (self.passwordTextField.text.length == 0) { + GIGA_ShowToast(@"请输入验证码"); return; } - [self loginWithAction:btn]; } -(void)loginWithAction:(UIButton *)btn{ -// NSDictionary *weixinInfoDic = [GiGaUserDefault getWeiXinAccessToenDic]; + // NSDictionary *weixinInfoDic = [GiGaUserDefault getWeiXinAccessToenDic]; NSString *wechatCode = [GiGaUserDefault getWeiXinCode]; - NSDictionary *params = nil; - if (wechatCode) { - params = @{ - @"username":self.acountTextField.text, - @"password":self.passwordTextField.text, - @"wechatCode":wechatCode, - }; - }else{ - - params = @{ - @"username":self.acountTextField.text, - @"password":self.passwordTextField.text - }; - } + @"mobile":self.acountTextField.text, + @"code":self.passwordTextField.text, + @"wechatCode":wechatCode, + }; //[GIGAMBHUDHelper messageAddto:self.view title:@"登录中..."]; [self.view makeToastActivity:CSToastPositionCenter]; - NSString *baseapi = [GiGaServerConfig getMainUrl]; - NSString *url = [NSString stringWithFormat:@"%@%@",baseapi,kApiUserLogin]; - [GiGaNetManager userbodyRequest:url params:params completionHandler:^(NSURLResponse *response, NSDictionary *resDic, NSError * _Nullable error) { - GILog(@"%@",resDic); + //NSString *baseapi = [GiGaServerConfig getMainUrl]; + //NSString *url = [NSString stringWithFormat:@"%@%@",baseapi,kApiUserloginWithSMSCode]; + +// [GiGaNetManager userbodyRequest:url params:params completionHandler:^(NSURLResponse *response, NSDictionary *resDic, NSError * _Nullable error) { +// GILog(@"%@",resDic); +// [self.view hideToastActivity]; +// GiGaAPIResult *result = [[GiGaAPIResult alloc] initWithDictionary:resDic]; +// GILog(@"**登陆***\n code:%ld\n message:%@\n *******\n",result.code,result.message); +// if (result.success) { +// [self userloginSussecess:resDic]; +// }else{ +// GIGA_ShowToast(result.message); +// } +// }]; + + //[GIGAMBHUDHelper messageAddto:self.view title:@"登录中..."]; + [self.view makeToastActivity:CSToastPositionCenter]; + GiGaBaseAPiRequest *api = [GiGaBaseAPiRequest initWithRequestPath:kApiUserloginWithSMSCode method:RequestPostMethod parms:params]; + [api requstDataWithResult:^(GiGaAPIResult *result) { [self.view hideToastActivity]; - GiGaAPIResult *result = [[GiGaAPIResult alloc] initWithDictionary:resDic]; GILog(@"**登陆***\n code:%ld\n message:%@\n *******\n",result.code,result.message); if (result.success) { - [self userloginSussecess:resDic]; + [self userloginSussecess:result.dic]; }else{ GIGA_ShowToast(result.message); @@ -300,7 +300,7 @@ }]; } -//上传微信用户信息 +// 微信登陆 -(void)gigaUploadweixinInfo:(NSDictionary *)weiXinUserinfo{ [self.view makeToastActivity:CSToastPositionCenter]; @@ -315,11 +315,10 @@ }else if([responseDict[@"code"] integerValue] == 500){ //登录流程待定 - [self.view makeToast:responseDict[@"msg"] duration:2.0 position:CSToastPositionCenter]; - [self jxt_showAlertWithTitle:@"温馨提示" message:@"请先绑定手机账号" appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) { + //[self.view makeToast:responseDict[@"msg"] duration:2.0 position:CSToastPositionCenter]; + [self jxt_showAlertWithTitle:@"温馨提示" message:responseDict[@"msg"] appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) { alertMaker.addActionCancelTitle(@"知道了"); } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) { - }]; }else{ @@ -360,18 +359,57 @@ self.acountTextField.text =(NSString *)noti.object; } -//密码加密按钮 +//短信验证码按钮 -(void)secretBtnAction:(UIButton *)btn{ - btn.selected = !btn.selected; - if (btn.selected) { - //秘文 - self.passwordTextField.secureTextEntry = YES; - [btn setImage:[UIImage imageNamed:@"btn_tab_notselect"] forState:UIControlStateSelected]; - }else{ - self.passwordTextField.secureTextEntry = NO; - [btn setImage:[UIImage imageNamed:@"btn_tab_desplay"] forState:UIControlStateNormal]; + if (![GiGaHelper isPhoneNumber:self.acountTextField.text]) { + GIGA_ShowToast(@"请输入正确手机号"); + return; + } + + [MBProgressHUD showHUDAddedTo:self.view animated:YES]; + + NSString *phoneNumber = self.acountTextField.text; + NSDictionary *param = @{ + @"mobile":phoneNumber + }; + GiGaBaseAPiRequest *api = [GiGaBaseAPiRequest initWithRequestPath:kApiIUserLoginSendCode method:RequestPostMethod parms:param]; + + [api requstDataWithResult:^(GiGaAPIResult *result) { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + GILog(@"短信获取%@",result.message); + + if (result.success) { + [self startTimer:btn]; + }else{ + GIGA_ShowToast(result.message); + } + }]; + +} + +//短信登录 验证码倒计时 +-(void)startTimer:(UIButton *)btn{ + + btn.userInteractionEnabled = NO; + if (_time>0) { + _timer = [NSTimer scheduledTimerWithTimeInterval:1 count:60 callback:^{ + NSString *timeStr=[NSString stringWithFormat:@"%lds",(long)self->_time]; + [btn setTitle:timeStr forState:UIControlStateNormal]; + self->_time--; + + if (self->_time==0) { + [self.secretBtn setTitle:@"发送短信" forState:UIControlStateNormal]; + + self->_time =60; + btn.userInteractionEnabled = YES; + } + + }]; + [[NSRunLoop currentRunLoop] addTimer:self.timer forMode:NSRunLoopCommonModes]; } } + + @end diff --git a/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.xib b/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.xib index 9521f85..b8f89f4 100644 --- a/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.xib +++ b/GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.xib @@ -47,7 +47,7 @@ - + @@ -63,7 +63,7 @@ - @@ -122,7 +127,7 @@ -