Skip to content

C
colorfulSchoolReconsitution
Commit cdbeba74 by 刘卓鑫
Options

任务内容提交 定版百青藤

parent d711926b
Showing with 1603 additions and 488 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
......@@ -59,6 +59,7 @@
1C73BEEF2243A0080078947F /* EventKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C73BEEE2243A0070078947F /* EventKit.framework */; };
1C73BEFB22447DA90078947F /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C73BEFA22447DA90078947F /* MessageUI.framework */; };
1C73BEFE22448E050078947F /* ZXBDADTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C73BEFD22448E050078947F /* ZXBDADTableViewCell.m */; };
1C76E3BE237E8ED6005E1041 /* LZNCollectionViewFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C76E3BC237E8ED5005E1041 /* LZNCollectionViewFlowLayout.m */; };
1C785977232F81440055A494 /* ZXAdViewAdTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C785976232F81440055A494 /* ZXAdViewAdTool.m */; };
1C78597F232F85E30055A494 /* ZXBDTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C78597C232F85E20055A494 /* ZXBDTool.m */; };
1C853BD522E0709F0050FD8D /* ZXBathShowAccountView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C853BD422E0709F0050FD8D /* ZXBathShowAccountView.m */; };
......@@ -74,7 +75,6 @@
1C8F4A672322358000AAF24A /* ZXUMStatisticsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C8F4A662322358000AAF24A /* ZXUMStatisticsManager.m */; };
1C96A9E5234C8ED5000EE043 /* ZXAlimamaModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96A9E4234C8ED5000EE043 /* ZXAlimamaModel.m */; };
1C96A9E8234C929B000EE043 /* ZXAlimamaCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96A9E7234C929B000EE043 /* ZXAlimamaCollectionViewCell.m */; };
1C96A9EB234C9501000EE043 /* LMHWaterFallLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96A9E9234C9500000EE043 /* LMHWaterFallLayout.m */; };
1C96F77222F7FA4F002DCA9B /* ZXHomePageAnnounceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96F77122F7FA4F002DCA9B /* ZXHomePageAnnounceView.m */; };
1C96F77722F80301002DCA9B /* ZXHomePageUpdateAppView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96F77622F80301002DCA9B /* ZXHomePageUpdateAppView.m */; };
1C96F77A22F813C4002DCA9B /* UserManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96F77922F813C4002DCA9B /* UserManager.m */; };
......@@ -83,6 +83,7 @@
1C96F78322F960F6002DCA9B /* ZXHomePageUserFeedbackCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96F78222F960F6002DCA9B /* ZXHomePageUserFeedbackCell.m */; };
1C96F78622F9611B002DCA9B /* ZXHomePageKefuReplyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96F78522F9611B002DCA9B /* ZXHomePageKefuReplyCell.m */; };
1C96F78922F997F0002DCA9B /* ZXHomePageMeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C96F78822F997F0002DCA9B /* ZXHomePageMeViewController.m */; };
1CA144F52387CC00007A4092 /* ZXTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CA144F42387CBFF007A4092 /* ZXTaskViewController.m */; };
1CA31627225C6AB2005ECF2B /* ZXAnnouncementView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CA31626225C6AB2005ECF2B /* ZXAnnouncementView.m */; };
1CA7E88B229E8E310014E95F /* JDSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1CA7E889229E8E310014E95F /* JDSDK.bundle */; };
1CA7E88C229E8E310014E95F /* JDSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CA7E88A229E8E310014E95F /* JDSDK.framework */; };
......@@ -122,6 +123,7 @@
1CB9AF72237102B500ED0434 /* DC_ZXWashOrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF50237102B400ED0434 /* DC_ZXWashOrderListModel.m */; };
1CB9AF73237102B500ED0434 /* DC_ZXWashMerthinModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF51237102B400ED0434 /* DC_ZXWashMerthinModel.m */; };
1CB9AF74237102B500ED0434 /* DC_ZXWashLocationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF56237102B400ED0434 /* DC_ZXWashLocationModel.m */; };
1CBDE2C6238D0436006DA46E /* ZXTaskManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */; };
1CC15429230D5B7400582EC1 /* ZXAimiWalletAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */; };
1CC1542D230D6E3600582EC1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */; };
1CC1543B230E2FB200582EC1 /* img_lauch.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1543A230E2FB200582EC1 /* img_lauch.png */; };
......@@ -828,6 +830,8 @@
1C73BEFA22447DA90078947F /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
1C73BEFC22448E050078947F /* ZXBDADTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXBDADTableViewCell.h; sourceTree = "<group>"; };
1C73BEFD22448E050078947F /* ZXBDADTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXBDADTableViewCell.m; sourceTree = "<group>"; };
1C76E3BC237E8ED5005E1041 /* LZNCollectionViewFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZNCollectionViewFlowLayout.m; sourceTree = "<group>"; };
1C76E3BD237E8ED6005E1041 /* LZNCollectionViewFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZNCollectionViewFlowLayout.h; sourceTree = "<group>"; };
1C785975232F81440055A494 /* ZXAdViewAdTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAdViewAdTool.h; sourceTree = "<group>"; };
1C785976232F81440055A494 /* ZXAdViewAdTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAdViewAdTool.m; sourceTree = "<group>"; };
1C78597C232F85E20055A494 /* ZXBDTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZXBDTool.m; sourceTree = "<group>"; };
......@@ -859,8 +863,6 @@
1C96A9E4234C8ED5000EE043 /* ZXAlimamaModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAlimamaModel.m; sourceTree = "<group>"; };
1C96A9E6234C929B000EE043 /* ZXAlimamaCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAlimamaCollectionViewCell.h; sourceTree = "<group>"; };
1C96A9E7234C929B000EE043 /* ZXAlimamaCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAlimamaCollectionViewCell.m; sourceTree = "<group>"; };
1C96A9E9234C9500000EE043 /* LMHWaterFallLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LMHWaterFallLayout.m; sourceTree = "<group>"; };
1C96A9EA234C9500000EE043 /* LMHWaterFallLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LMHWaterFallLayout.h; sourceTree = "<group>"; };
1C96F77022F7FA4F002DCA9B /* ZXHomePageAnnounceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXHomePageAnnounceView.h; sourceTree = "<group>"; };
1C96F77122F7FA4F002DCA9B /* ZXHomePageAnnounceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageAnnounceView.m; sourceTree = "<group>"; };
1C96F77522F80301002DCA9B /* ZXHomePageUpdateAppView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXHomePageUpdateAppView.h; sourceTree = "<group>"; };
......@@ -877,6 +879,8 @@
1C96F78522F9611B002DCA9B /* ZXHomePageKefuReplyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageKefuReplyCell.m; sourceTree = "<group>"; };
1C96F78722F997F0002DCA9B /* ZXHomePageMeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXHomePageMeViewController.h; sourceTree = "<group>"; };
1C96F78822F997F0002DCA9B /* ZXHomePageMeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageMeViewController.m; sourceTree = "<group>"; };
1CA144F32387CBFF007A4092 /* ZXTaskViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXTaskViewController.h; sourceTree = "<group>"; };
1CA144F42387CBFF007A4092 /* ZXTaskViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXTaskViewController.m; sourceTree = "<group>"; };
1CA31625225C6AB2005ECF2B /* ZXAnnouncementView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZXAnnouncementView.h; sourceTree = "<group>"; };
1CA31626225C6AB2005ECF2B /* ZXAnnouncementView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZXAnnouncementView.m; sourceTree = "<group>"; };
1CA7E889229E8E310014E95F /* JDSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = JDSDK.bundle; sourceTree = "<group>"; };
......@@ -952,6 +956,8 @@
1CB9AF55237102B400ED0434 /* DC_ZXWashOrderListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DC_ZXWashOrderListModel.h; sourceTree = "<group>"; };
1CB9AF56237102B400ED0434 /* DC_ZXWashLocationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DC_ZXWashLocationModel.m; sourceTree = "<group>"; };
1CB9AF57237102B400ED0434 /* DC_ZXWashMerthinModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DC_ZXWashMerthinModel.h; sourceTree = "<group>"; };
1CBDE2C4238D0435006DA46E /* ZXTaskManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXTaskManager.h; sourceTree = "<group>"; };
1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXTaskManager.m; sourceTree = "<group>"; };
1CC15427230D5B7400582EC1 /* ZXAimiWalletAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAimiWalletAlertView.h; sourceTree = "<group>"; };
1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAimiWalletAlertView.m; sourceTree = "<group>"; };
1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
......@@ -1157,7 +1163,7 @@
22E57B421F8E0864008A753E /* UIView+ABExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+ABExtras.m"; sourceTree = "<group>"; };
22E57B471F8E0E54008A753E /* ColorfulSchool.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ColorfulSchool.entitlements; sourceTree = "<group>"; };
81EC60F6C49356EC50793851 /* Pods-ColorfulSchool.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ColorfulSchool.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.debug.xcconfig"; sourceTree = "<group>"; };
9142D2B71F35C84E004F90CF /* ColorfulSchool.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ColorfulSchool.app; sourceTree = BUILT_PRODUCTS_DIR; };
9142D2B71F35C84E004F90CF /* 多彩校园.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "多彩校园.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9142D2BB1F35C84E004F90CF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
9142D2C71F35C84E004F90CF /* ColorfulSchool.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ColorfulSchool.xcdatamodel; sourceTree = "<group>"; };
9142D2CE1F35C84E004F90CF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
......@@ -2063,8 +2069,8 @@
1C32C15C234C39A500DBA2E1 /* AliMaMa */ = {
isa = PBXGroup;
children = (
1C96A9EA234C9500000EE043 /* LMHWaterFallLayout.h */,
1C96A9E9234C9500000EE043 /* LMHWaterFallLayout.m */,
1C76E3BD237E8ED6005E1041 /* LZNCollectionViewFlowLayout.h */,
1C76E3BC237E8ED5005E1041 /* LZNCollectionViewFlowLayout.m */,
1C32C15D234C3A9500DBA2E1 /* ZXAliMaMaViewController.h */,
1C32C15E234C3A9500DBA2E1 /* ZXAliMaMaViewController.m */,
1C96A9E3234C8ED5000EE043 /* ZXAlimamaModel.h */,
......@@ -2426,6 +2432,17 @@
path = customViews;
sourceTree = "<group>";
};
1CA144F22387CBDC007A4092 /* Task(任务) */ = {
isa = PBXGroup;
children = (
1CA144F32387CBFF007A4092 /* ZXTaskViewController.h */,
1CA144F42387CBFF007A4092 /* ZXTaskViewController.m */,
1CBDE2C4238D0435006DA46E /* ZXTaskManager.h */,
1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */,
);
path = "Task(任务)";
sourceTree = "<group>";
};
1CB3AC1023053BE0006F1724 /* CropImage */ = {
isa = PBXGroup;
children = (
......@@ -3045,7 +3062,7 @@
9142D2B81F35C84E004F90CF /* Products */ = {
isa = PBXGroup;
children = (
9142D2B71F35C84E004F90CF /* ColorfulSchool.app */,
9142D2B71F35C84E004F90CF /* 多彩校园.app */,
9142D2D31F35C84E004F90CF /* ColorfulSchoolTests.xctest */,
9142D2DE1F35C84E004F90CF /* ColorfulSchoolUITests.xctest */,
);
......@@ -4111,6 +4128,7 @@
A7DECC542079F0E20039EC22 /* Classes */ = {
isa = PBXGroup;
children = (
1CA144F22387CBDC007A4092 /* Task(任务) */,
1CC256CF234DBC0E00C43041 /* BQT(百青藤) */,
1C32C15C234C39A500DBA2E1 /* AliMaMa */,
1C39412F230BD0FD005048EB /* HomePage(首页) */,
......@@ -4943,7 +4961,7 @@
);
name = ColorfulSchool;
productName = ColorfulSchool;
productReference = 9142D2B71F35C84E004F90CF /* ColorfulSchool.app */;
productReference = 9142D2B71F35C84E004F90CF /* 多彩校园.app */;
productType = "com.apple.product-type.application";
};
9142D2D21F35C84E004F90CF /* ColorfulSchoolTests */ = {
......@@ -5262,6 +5280,7 @@
2215B61D1F95B12B00C37778 /* GraphicsCode.m in Sources */,
A7F3E1A721B5330F00010E23 /* XDSPhotoBrowser.m in Sources */,
1CB9AF72237102B500ED0434 /* DC_ZXWashOrderListModel.m in Sources */,
1CBDE2C6238D0436006DA46E /* ZXTaskManager.m in Sources */,
A7BF950321104276007466F0 /* ZXPercetMoneyModel.m in Sources */,
A705C01F21D4B067004F1628 /* MWTapDetectingView.m in Sources */,
A7F3E1B421B5330F00010E23 /* XDSMenuBottomView.m in Sources */,
......@@ -5325,7 +5344,6 @@
A7F3E19921B5330F00010E23 /* CTidy.m in Sources */,
A756C5B121F9B5960006E418 /* ZXNewOrderListViewController.m in Sources */,
A7F3E1CF21B535C000010E23 /* ioapi.c in Sources */,
1C96A9EB234C9501000EE043 /* LMHWaterFallLayout.m in Sources */,
A7F3E01521B530F500010E23 /* ZXBookSearchListModel.m in Sources */,
A7F3E1B521B5330F00010E23 /* XDSMenuTopView.m in Sources */,
226355041F4D1F1100018E69 /* SaveUserInfoModel.m in Sources */,
......@@ -5492,6 +5510,7 @@
A705BF7A21D47FB3004F1628 /* YYFrameImage.m in Sources */,
A723B80D21129B7000ED9269 /* FreeProtocol.m in Sources */,
A77F92A3217582C900D633B4 /* MulityAdCell.m in Sources */,
1CA144F52387CC00007A4092 /* ZXTaskViewController.m in Sources */,
1C0210C12318AF730074D691 /* ZXOpenBlueToothView.m in Sources */,
A756C5AD21F9B5960006E418 /* ZXNewOrderDetailViewController.m in Sources */,
A756C5A721F9B5960006E418 /* ZXNewOrderDetailTableViewCell.m in Sources */,
......@@ -5600,6 +5619,7 @@
1CB9AF63237102B400ED0434 /* DC_ZXWashMyInvitorCell.m in Sources */,
A75436E221D34567005584CC /* RegisterModel.m in Sources */,
A7FE8D8D20C8FB330028B721 /* JKDBModel.m in Sources */,
1C76E3BE237E8ED6005E1041 /* LZNCollectionViewFlowLayout.m in Sources */,
A7079CDB21BE0E3C0063EDCB /* ZXTextView.m in Sources */,
A75436DA21D34567005584CC /* MQVerCodeImageView.m in Sources */,
1C8F4A61232135F200AAF24A /* ZXFullScreenAdView.m in Sources */,
......@@ -5869,6 +5889,7 @@
"$(PROJECT_DIR)/ColorfulSchool/Classes/AD(广告)/BDAD",
"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/MUB",
"$(PROJECT_DIR)/ColorfulSchool/Classes/AD(广告)/BUAD",
"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/BaiduSdk",
);
GCC_PREFIX_HEADER = "$(SRCROOT)/ColorfulSchool/PrefixHeader.pch";
HEADER_SEARCH_PATHS = (
......@@ -5946,7 +5967,7 @@
"-lxml2",
);
PRODUCT_BUNDLE_IDENTIFIER = com.pxkjformal.parallelcampus;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "多彩校园";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "/Users/Guest/schoolapp-ios/ColorfulSchool/ColorfulSchool/ColorfulSchool-Bridging-Header.h";
......@@ -6111,6 +6132,7 @@
"$(PROJECT_DIR)/ColorfulSchool/Classes/AD(广告)/BDAD",
"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/MUB",
"$(PROJECT_DIR)/ColorfulSchool/Classes/AD(广告)/BUAD",
"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/BaiduSdk",
);
GCC_PREFIX_HEADER = "$(SRCROOT)/ColorfulSchool/PrefixHeader.pch";
HEADER_SEARCH_PATHS = (
......@@ -6187,7 +6209,7 @@
"-lxml2",
);
PRODUCT_BUNDLE_IDENTIFIER = com.pxkjformal.parallelcampus;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "多彩校园";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "/Users/Guest/schoolapp-ios/ColorfulSchool/ColorfulSchool/ColorfulSchool-Bridging-Header.h";
......@@ -6217,6 +6239,7 @@
"$(PROJECT_DIR)/ColorfulSchool/Classes/AD(广告)/BDAD",
"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/MUB",
"$(PROJECT_DIR)/ColorfulSchool/Classes/AD(广告)/BUAD",
"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/BaiduSdk",
);
GCC_PREFIX_HEADER = "$(SRCROOT)/ColorfulSchool/PrefixHeader.pch";
HEADER_SEARCH_PATHS = (
......@@ -6295,7 +6318,7 @@
"-lxml2",
);
PRODUCT_BUNDLE_IDENTIFIER = com.pxkjformal.parallelcampus;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "多彩校园";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "/Users/Guest/schoolapp-ios/ColorfulSchool/ColorfulSchool/ColorfulSchool-Bridging-Header.h";
......
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
......@@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9142D2B61F35C84E004F90CF"
BuildableName = "ColorfulSchool.app"
BuildableName = "&#x591a;&#x5f69;&#x6821;&#x56ed;.app"
BlueprintName = "ColorfulSchool"
ReferencedContainer = "container:ColorfulSchool.xcodeproj">
</BuildableReference>
......@@ -31,7 +31,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9142D2B61F35C84E004F90CF"
BuildableName = "ColorfulSchool.app"
BuildableName = "&#x591a;&#x5f69;&#x6821;&#x56ed;.app"
BlueprintName = "ColorfulSchool"
ReferencedContainer = "container:ColorfulSchool.xcodeproj">
</BuildableReference>
......@@ -74,7 +74,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9142D2B61F35C84E004F90CF"
BuildableName = "ColorfulSchool.app"
BuildableName = "&#x591a;&#x5f69;&#x6821;&#x56ed;.app"
BlueprintName = "ColorfulSchool"
ReferencedContainer = "container:ColorfulSchool.xcodeproj">
</BuildableReference>
......@@ -98,7 +98,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9142D2B61F35C84E004F90CF"
BuildableName = "ColorfulSchool.app"
BuildableName = "&#x591a;&#x5f69;&#x6821;&#x56ed;.app"
BlueprintName = "ColorfulSchool"
ReferencedContainer = "container:ColorfulSchool.xcodeproj">
</BuildableReference>
......
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -15,5 +15,229 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D27F3EA6-7795-48BB-AEC3-BC5851869566"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BDAD/ZXBDTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "359"
endingLineNumber = "359"
landmarkName = "-rewardedVideoAdDidClose:withPlayingProgress:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F38EFD70-E808-4913-87DE-8931053D77E1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "93"
endingLineNumber = "93"
landmarkName = "-nativeExpressRewardedVideoAdDidLoad:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7CDAC643-8501-4CA2-81EA-23162966F16C"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "97"
endingLineNumber = "97"
landmarkName = "-nativeExpressRewardedVideoAd:didFailWithError:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6EDFFD59-E444-4924-805F-44A7B75E56A5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "101"
endingLineNumber = "101"
landmarkName = "-nativeExpressRewardedVideoAdDidDownLoadVideo:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B3BFBC86-4F77-411D-BE84-00BD3C015D6F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "105"
endingLineNumber = "105"
landmarkName = "-nativeExpressRewardedVideoAdViewRenderSuccess:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BCEE29E8-B1FE-4369-AB76-AD84BA29CD0D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
landmarkName = "-nativeExpressRewardedVideoAdViewRenderFail:error:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5C1278E6-F57B-4225-854F-7DC212D99AF7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "113"
endingLineNumber = "113"
landmarkName = "-nativeExpressRewardedVideoAdWillVisible:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B9102605-E063-411A-B490-261C6BB8EC1D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "117"
endingLineNumber = "117"
landmarkName = "-nativeExpressRewardedVideoAdDidVisible:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CC0A2426-E2A6-4AF8-9FBD-0AAE82E1D665"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "121"
endingLineNumber = "121"
landmarkName = "-nativeExpressRewardedVideoAdWillClose:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E4E4E557-6F6A-48A1-9714-0AE82D9802C1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "130"
endingLineNumber = "130"
landmarkName = "-nativeExpressRewardedVideoAdDidClick:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E3F215BD-6FC1-4381-A634-A82FD8C922C4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "126"
endingLineNumber = "126"
landmarkName = "-nativeExpressRewardedVideoAdDidClose:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "95F9AB98-B7EF-48B1-8331-903D9917B1A1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "134"
endingLineNumber = "134"
landmarkName = "-nativeExpressRewardedVideoAdDidClickSkip:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CE397208-1542-44B6-A2C4-8BA29D86045A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "142"
endingLineNumber = "142"
landmarkName = "-nativeExpressRewardedVideoAdServerRewardDidSucceed:verify:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B81B6351-6883-4D21-B0AF-38769F71763B"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "146"
endingLineNumber = "146"
landmarkName = "-nativeExpressRewardedVideoAdServerRewardDidFail:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
ColorfulSchool/ColorfulSchool/AppDelegate.m
......@@ -19,8 +19,13 @@
#import "YWPrintViewController.h"
#import "XMGFileTool.h"
#import "FTUploader.h"
#import "ZXBDTool.h"
#import "ZXNewOrderDetailViewController.h"
#import <AFNetworkReachabilityManager.h>
#import "BaiduMobAdSDK/BaiduMobAdSplash.h"
#import "BaiduMobAdSDK/BaiduMobAdView.h"
#import "BaiduMobAdSDK/BaiduMobAdSetting.h"
#import "BDADHeader.h"
// 引入JPush功能所需头文件
#import <JPUSHService.h>
// iOS10注册APNs所需头文件
......@@ -45,7 +50,7 @@
#import "ZXAdViewAdTool.h"
#import "BUADTool.h"
@interface AppDelegate ()<WXApiDelegate,UIAlertViewDelegate,UITabBarControllerDelegate,JPUSHRegisterDelegate, AVSpeechSynthesizerDelegate, BUSplashAdDelegate>
@interface AppDelegate ()<WXApiDelegate,UIAlertViewDelegate,UITabBarControllerDelegate,JPUSHRegisterDelegate, AVSpeechSynthesizerDelegate, BUSplashAdDelegate, BaiduMobAdSplashDelegate>
{
BOOL _isPlaying;//是否正在播放
}
......@@ -54,7 +59,10 @@
@property (nonatomic,strong) UIAlertView *updateAlert;
@property (nonatomic, strong) UpdateVersionModel *updateModel;
@property (nonatomic) NSDictionary * notifyDic;
/** */
@property (nonatomic, strong) BaiduMobAdSplash *splash;
/** */
@property (nonatomic, strong) UIView *splashView;
@end
@implementation AppDelegate
......@@ -65,7 +73,7 @@
_isPlaying = NO;
//启动环境
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentTest;
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentDevelop;
//极光推送
[self initPushWithOptions:launchOptions isProduct:YES];
......@@ -75,9 +83,14 @@
//token登录
[self tokenLogin];
//注册穿山甲
[BUADTool setupBUAdSDK];
//开屏广告
[ZXAdTool startLauchAd];
@weakify(self);
[ZXAdTool startLauchAdIsBaiduAd:^{
@strongify(self);
[self createBaiduLauchAd];
}];
//版本检测
[self checkVersion];
......@@ -94,6 +107,53 @@
[[NSRunLoop mainRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
return YES;
}
#pragma mark - BaiduMobAdViewDelegate
- (NSString *)publisherId
{
return kBaiduAdAppId;
}
-(BOOL) enableLocation
{
//启用location会有一次alert提示
return YES;
}
-(void) willDisplayAd:(BaiduMobAdView*) adview
{
NSLog(@"delegate: will display ad");
}
-(void) failedDisplayAd:(BaiduMobFailReason) reason;
{
NSLog(@"delegate: failedDisplayAd %d", reason);
}
- (void)didAdImpressed {
NSLog(@"delegate: didAdImpressed");
}
- (void)didAdClicked {
NSLog(@"delegate: didAdClicked");
}
#pragma mark - 开屏广告
- (void) createBaiduLauchAd {
self.splash = [[BaiduMobAdSplash alloc] init];
self.splash.delegate = self;
self.splash.AdUnitTag = kBaiduAdLauchId;
UIWindow *window = [[UIApplication sharedApplication] keyWindow];
self.splashView = [[UIView alloc] initWithFrame:window.frame];
[window addSubview:self.splashView];
[self.splash loadAndDisplayUsingContainerView:self.splashView];
}
#pragma mark - 穿山甲广告Delegate
- (void)splashAdDidClose:(BUSplashAdView *)splashAd {
[splashAd removeFromSuperview];
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BDAD/ZXBDTool.h
//
//
......@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
//单例化
kSINGLETON_FOR_HEADER(ZXBDTool)
- (void) createNativie20_3AdByView:(UIView *) view;
- (void) createNativieAdByView:(UIView *) view
topView:(UIView *) topView
......@@ -28,6 +28,14 @@ kSINGLETON_FOR_HEADER(ZXBDTool)
- (void) createBaiduLauchAdView;
- (void) createLauchAdWithDelegate:(id) delegate;
//创建激励视频广告
- (void) createRewardVideoAd;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BDAD/ZXBDTool.m
//
//
......@@ -11,11 +11,18 @@
#import "BaiduMobAdSDK/BaiduMobAdSetting.h"
#import "BaiduMobAdSDK/BaiduMobAdSplash.h"
#import "BDADHeader.h"
#import "BaiduMobAdSDK/BaiduMobAdRewardVideo.h"
#import "BaiduMobAdSDK/BaiduMobAdSetting.h"
@interface ZXBDTool ()<BaiduMobAdViewDelegate, BaiduMobAdSplashDelegate> {
@interface ZXBDTool ()<BaiduMobAdViewDelegate, BaiduMobAdSplashDelegate, BaiduMobAdRewardVideoDelegate> {
BaiduMobAdView *sharedAdView;
}
@property (nonatomic, strong) BaiduMobAdRewardVideo *reward;
/** */
@property (nonatomic, strong) BaiduMobAdSplash *splash;
/** */
@property (nonatomic, strong) UIView *splashView;
@property (nonatomic, strong) dispatch_source_t gcdTimer;
@end
......@@ -82,6 +89,26 @@ kSINGLETON_FOR_CLASS(ZXBDTool)
[self createCountingDowViewByAdView:sharedAdView];
}
}
- (void) createNativie20_3AdByView:(UIView *) view {
[BaiduMobAdSetting setLpStyle:BaiduMobAdLpStyleDefault];
//使用嵌入广告的方法实例。
sharedAdView = [[BaiduMobAdView alloc] init];
sharedAdView.AdUnitTag = @"6592671";
sharedAdView.AdType = BaiduMobAdViewTypeBanner;
[view insertSubview:sharedAdView atIndex:0];
[sharedAdView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(view.mas_left).offset(5 * k6Scale);
make.right.equalTo(view.mas_right).offset(-5 * k6Scale);
make.height.mas_equalTo(kScreenWidth * 0.15);
make.bottom.equalTo(view.mas_bottom).offset(-kScreenWidth * 0.15);
}];
sharedAdView.delegate = self;
[sharedAdView start];
}
#pragma mark - ========== 创建删除view ==========
- (void) createRemoveAdView:(BaiduMobAdView *) expressView{
UIImageView *closeBg = [[UIImageView alloc] init];
......@@ -178,6 +205,21 @@ kSINGLETON_FOR_CLASS(ZXBDTool)
sharedAdView = nil;
}
- (void) createLauchAdWithDelegate:(id) delegate{
self.splash = [[BaiduMobAdSplash alloc] init];
self.splash.delegate = delegate;
self.splash.AdUnitTag = kBaiduAdLauchId;
UIWindow *window = [[UIApplication sharedApplication] keyWindow];
self.splashView = [[UIView alloc] initWithFrame:window.frame];
[window addSubview:self.splashView];
[self.splash loadAndDisplayUsingContainerView:self.splashView];
}
#pragma mark - BaiduMobAdViewDelegate
- (NSString *)publisherId
{
......@@ -267,4 +309,54 @@ kSINGLETON_FOR_CLASS(ZXBDTool)
}
//创建激励视频广告
- (void) createRewardVideoAd {
self.reward = [[BaiduMobAdRewardVideo alloc] init];
self.reward.delegate = self;
self.reward.AdUnitTag = @"6697174";
self.reward.publisherId = kBaiduAdAppId;
[self.reward load];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self.reward showFromViewController:[ZXTool getCurrentVC]];
});
}
- (void)rewardedVideoAdLoaded:(BaiduMobAdRewardVideo *)video {
[[[UIAlertView alloc]initWithTitle:@"激励视频缓存成功" message:nil delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil, nil] show];
NSLog(@"激励视频缓存成功");
}
- (void)rewardedVideoAdLoadFailed:(BaiduMobAdRewardVideo *)video withError:(BaiduMobFailReason)reason {
[[[UIAlertView alloc]initWithTitle:@"激励视频缓存失败" message:nil delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil, nil] show];
NSLog(@"激励视频缓存失败，failReason：%d",reason);
}
- (void)rewardedVideoAdShowFailed:(BaiduMobAdRewardVideo *)video withError:(BaiduMobFailReason)reason {
NSLog(@"激励视频展现失败，failReason：%d",reason);
//异常情况处理
[[[UIAlertView alloc]initWithTitle:@"激励视频展现失败" message:nil delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil, nil] show];
}
- (void)rewardedVideoAdDidStarted:(BaiduMobAdRewardVideo *)video {
NSLog(@"激励视频开始播放");
}
- (void)rewardedVideoAdDidPlayFinish:(BaiduMobAdRewardVideo *)video {
NSLog(@"激励视频完成播放");
}
- (void)rewardedVideoAdDidClick:(BaiduMobAdRewardVideo *)video withPlayingProgress:(CGFloat)progress {
NSLog(@"激励视频LP被点击，progress:%f",progress);
}
- (void)rewardedVideoAdDidClose:(BaiduMobAdRewardVideo *)video withPlayingProgress:(CGFloat)progress {
NSLog(@"激励视频点击关闭,progress:%f",progress);
}
@end
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BUAD/BUADTool.h
//
//
......@@ -12,10 +12,18 @@ NS_ASSUME_NONNULL_BEGIN
@interface BUADTool : NSObject
- (void)setupBUAdSDKAndLoadLauchAdByDelegate:(id) delegate;
+ (void)setupBUAdSDK;
- (void) loadLauchAdByDelegate:(id) delagte;
- (void) loadBannerAdWithController:(UIViewController *) viewController;
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView;
//创建激励视频
- (void) createRewardedVideoAdWithController:(UIViewController *) viewController;
////展示激励视频广告
//- (void) showRewardedVideoAd;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BUAD/BUADTool.m
//
//
......@@ -9,22 +9,24 @@
#import "BUADTool.h"
#import <BUAdSDK/BUAdSDK.h>
@interface BUADTool()
@interface BUADTool()<BUNativeExpressRewardedVideoAdDelegate, BUNativeExpressBannerViewDelegate>
/** */
@property (nonatomic, strong) BUNativeExpressBannerView *bannerView;
@property (nonatomic, strong) BUNativeExpressRewardedVideoAd *rewardedAd;
@end
@implementation BUADTool
- (void)setupBUAdSDKAndLoadLauchAdByDelegate:(id) delegate {
+ (void)setupBUAdSDK {
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
dispatch_async(dispatch_get_main_queue(), ^{
[BUAdSDKManager setAppID:@"5033112"];
[BUAdSDKManager setIsPaidApp:NO];
// splash AD demo
[self loadLauchAdByDelegate:delegate];
});
});
}
......@@ -57,20 +59,90 @@
NSLog(@"穿山甲开屏广告加载失败");
}
- (void) loadBannerAdWithController:(UIViewController *) viewController {
[BUAdSDKManager setAppID:@"5033112"];
[BUAdSDKManager setIsPaidApp:NO];
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView {
// splash AD demo
BUSize *imgSize = [BUSize sizeBy:BUProposalSize_Banner600_90];
CGFloat bannerHeigh = kScreenWidth/600*90;
if (self.bannerView == nil) {
self.bannerView = [[BUNativeExpressBannerView alloc] initWithSlotID:@"933112579" rootViewController:viewController imgSize:imgSize adSize:CGSizeMake(kScreenWidth, bannerHeigh) IsSupportDeepLink:YES];
self.bannerView.frame = CGRectMake(0, kScreenHeight - bannerHeigh, kScreenWidth, bannerHeigh);
self.bannerView.delegate = (id)viewController;
[viewController.view addSubview:self.bannerView];
self.bannerView.frame = CGRectMake(0, kScreenWidth * 0.3 + 10 * k6Scale - bannerHeigh, kScreenWidth, bannerHeigh);
self.bannerView.delegate = self;
[superView addSubview:self.bannerView];
}
[self.bannerView loadAdData];
}
- (void)createRewardedVideoAdWithController:(UIViewController *)viewController {
BURewardedVideoModel *model = [[BURewardedVideoModel alloc] init];
model.userId = @"123";
self.rewardedAd = [[BUNativeExpressRewardedVideoAd alloc] initWithSlotID:@"933112439" rewardedVideoModel:model];
self.rewardedAd.delegate = self;
[self.rewardedAd loadAdData];
//为保证播放流畅和展示流畅建议可在收到渲染成功和视频下载完成回调后再展示视频。
if (self.rewardedAd.isAdValid) {
[self.rewardedAd showAdFromRootViewController:viewController.navigationController];
}
}
#pragma mark - BUNativeExpressRewardedVideoAdDelegate
- (void)nativeExpressRewardedVideoAdDidLoad:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAd:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd didFailWithError:(NSError *_Nullable)error {
}
- (void)nativeExpressRewardedVideoAdDidDownLoadVideo:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdViewRenderSuccess:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdViewRenderFail:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd error:(NSError *_Nullable)error {
}
- (void)nativeExpressRewardedVideoAdWillVisible:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdDidVisible:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdWillClose:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdDidClose:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
[self.rewardedAd loadAdData];
}
- (void)nativeExpressRewardedVideoAdDidClick:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdDidClickSkip:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdDidPlayFinish:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd didFailWithError:(NSError *_Nullable)error {
}
- (void)nativeExpressRewardedVideoAdServerRewardDidSucceed:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd verify:(BOOL)verify {
}
- (void)nativeExpressRewardedVideoAdServerRewardDidFail:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
@end
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.h
//
//
......@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface ZXAdTool : NSObject
+ (void) startLauchAd;
+ (void) startLauchAdIsBaiduAd:(dispatch_block_t) baiduAd;
@end
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.m
//
//
......@@ -17,11 +17,11 @@
@implementation ZXAdTool
+ (void) startLauchAd {
+ (void) startLauchAdIsBaiduAd:(dispatch_block_t) baiduAd {
//开屏广告 二次展示
if (CacheUserId == nil) {
return;
}
// if (CacheUserId == nil) {
// return;
// }
// ZXLauchModel *lastAd = [ZXLauchModel findAll].lastObject;
// if (lastAd && lastAd.whether) {
// if (lastAd.platformSource == 1) {
......@@ -58,8 +58,9 @@
// }];
//开屏广告 1次展示
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/tencent/advertisement/spread2?id=%@&sourceType=iOS", [kUserDefaults valueForKey:@"SX_MONEY"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/app/open/advert/round/info?id=%@&sourceType=0", [kUserDefaults valueForKey:@"SX_MONEY"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
if (error == nil) {
ZXLauchModel *lauch = [ZXLauchModel mj_objectWithKeyValues:common.data];
[ZXLauchModel clearTable];
......@@ -67,6 +68,7 @@
if (lauch.whether == NO) {
return ;
}
dispatch_async(dispatch_get_main_queue(), ^{
if (lauch.isButt) {
......@@ -78,7 +80,10 @@
[[[ZXAdViewAdTool alloc] init] startLauchAd];
break;
case 5: //穿山甲
[[BUADTool new] setupBUAdSDKAndLoadLauchAdByDelegate:UIApplication.sharedApplication.delegate];
[[[BUADTool alloc] init] loadLauchAdByDelegate:UIApplication.sharedApplication.delegate];
break;
case 6: //百度
baiduAd();
break;
default:
break;
......
ColorfulSchool/ColorfulSchool/Classes/AliMaMa/LMHWaterFallLayout.h deleted 100644 → 0
//
// LMHWaterFallLayout.h
// WateFallLayoutTest
//
// Created by 刘梦桦 on 2017/5/18.
// Copyright © 2017年 lmh. All rights reserved.
//
#import <UIKit/UIKit.h>
@class LMHWaterFallLayout;
@protocol LMHWaterFallLayoutDeleaget<NSObject>
@required
/**
* 每个item的高度
*/
- (CGFloat)waterFallLayout:(LMHWaterFallLayout *)waterFallLayout heightForItemAtIndexPath:(NSUInteger)indexPath itemWidth:(CGFloat)itemWidth;
@optional
/**
* 有多少列
*/
- (NSUInteger)columnCountInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout;
/**
* 每列之间的间距
*/
- (CGFloat)columnMarginInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout;
/**
* 每行之间的间距
*/
- (CGFloat)rowMarginInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout;
/**
* 每个item的内边距
*/
- (UIEdgeInsets)edgeInsetdInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout;
@end
@interface LMHWaterFallLayout : UICollectionViewLayout
/** 代理 */
@property (nonatomic, weak) id<LMHWaterFallLayoutDeleaget> delegate;
@end
ColorfulSchool/ColorfulSchool/Classes/AliMaMa/LMHWaterFallLayout.m deleted 100644 → 0
//
// LMHWaterFallLayout.m
// WateFallLayoutTest
//
// Created by 刘梦桦 on 2017/5/18.
// Copyright © 2017年 lmh. All rights reserved.
//
#import "LMHWaterFallLayout.h"
/** 默认的列数 */
static const CGFloat LMHDefaultColunmCount = 3;
/** 每一列之间的间距 */
static const CGFloat LMHDefaultColunmMargin = 10;
/** 每一行之间的间距 */
static const CGFloat LMHDefaultRowMargin = 10;
/** 内边距 */
static const UIEdgeInsets LMHDefaultEdgeInsets = {10,10,10,10};
@interface LMHWaterFallLayout()
/** 存放所有的布局属性 */
@property (nonatomic, strong) NSMutableArray * attrsArr;
/** 存放所有列的当前高度 */
@property (nonatomic, strong) NSMutableArray *columnHeights;
/** 内容的高度 */
@property (nonatomic, assign) CGFloat contentHeight;
- (NSUInteger)colunmCount;
- (CGFloat)columnMargin;
- (CGFloat)rowMargin;
- (UIEdgeInsets)edgeInsets;
@end
@implementation LMHWaterFallLayout
#pragma mark 懒加载
- (NSMutableArray *)attrsArr{
if (!_attrsArr) {
_attrsArr = [NSMutableArray array];
}
return _attrsArr;
}
- (NSMutableArray *)columnHeights{
if (!_columnHeights) {
_columnHeights = [NSMutableArray array];
}
return _columnHeights;
}
#pragma mark - 数据处理
/**
* 列数
*/
- (NSUInteger)colunmCount{
if ([self.delegate respondsToSelector:@selector(columnCountInWaterFallLayout:)]) {
return [self.delegate columnCountInWaterFallLayout:self];
}else{
return LMHDefaultColunmCount;
}
}
/**
* 列间距
*/
- (CGFloat)columnMargin{
if ([self.delegate respondsToSelector:@selector(columnMarginInWaterFallLayout:)]) {
return [self.delegate columnMarginInWaterFallLayout:self];
}else{
return LMHDefaultColunmMargin;
}
}
/**
* 行间距
*/
- (CGFloat)rowMargin{
if ([self.delegate respondsToSelector:@selector(rowMarginInWaterFallLayout:)]) {
return [self.delegate rowMarginInWaterFallLayout:self];
}else{
return LMHDefaultRowMargin;
}
}
/**
* item的内边距
*/
- (UIEdgeInsets)edgeInsets{
if ([self.delegate respondsToSelector:@selector(edgeInsetdInWaterFallLayout:)]) {
return [self.delegate edgeInsetdInWaterFallLayout:self];
}else{
return LMHDefaultEdgeInsets;
}
}
/**
* 初始化
*/
- (void)prepareLayout{
[super prepareLayout];
self.contentHeight = 0;
// 清楚之前计算的所有高度
[self.columnHeights removeAllObjects];
// 设置每一列默认的高度
for (NSInteger i = 0; i < LMHDefaultColunmCount ; i ++) {
[self.columnHeights addObject:@(LMHDefaultEdgeInsets.top)];
}
// 清楚之前所有的布局属性
[self.attrsArr removeAllObjects];
// 开始创建每一个cell对应的布局属性
NSInteger count = [self.collectionView numberOfItemsInSection:0];
for (int i = 0; i < count; i++) {
// 创建位置
NSIndexPath * indexPath = [NSIndexPath indexPathForItem:i inSection:0];
// 获取indexPath位置上cell对应的布局属性
UICollectionViewLayoutAttributes * attrs = [self layoutAttributesForItemAtIndexPath:indexPath];
[self.attrsArr addObject:attrs];
}
}
/**
* 返回indexPath位置cell对应的布局属性
*/
- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath{
// 创建布局属性
UICollectionViewLayoutAttributes * attrs = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
//collectionView的宽度
CGFloat collectionViewW = self.collectionView.frame.size.width;
// 设置布局属性的frame
CGFloat cellW = (collectionViewW - self.edgeInsets.left - self.edgeInsets.right - (self.colunmCount - 1) * self.columnMargin) / self.colunmCount;
CGFloat cellH = [self.delegate waterFallLayout:self heightForItemAtIndexPath:indexPath.item itemWidth:cellW];
// 找出最短的那一列
NSInteger destColumn = 0;
CGFloat minColumnHeight = [self.columnHeights[0] doubleValue];
for (int i = 1; i < LMHDefaultColunmCount; i++) {
// 取得第i列的高度
CGFloat columnHeight = [self.columnHeights[i] doubleValue];
if (minColumnHeight > columnHeight) {
minColumnHeight = columnHeight;
destColumn = i;
}
}
CGFloat cellX = self.edgeInsets.left + destColumn * (cellW + self.columnMargin);
CGFloat cellY = minColumnHeight;
if (cellY != self.edgeInsets.top) {
cellY += self.rowMargin;
}
attrs.frame = CGRectMake(cellX, cellY, cellW, cellH);
// 更新最短那一列的高度
self.columnHeights[destColumn] = @(CGRectGetMaxY(attrs.frame));
// 记录内容的高度 - 即最长那一列的高度
CGFloat maxColumnHeight = [self.columnHeights[destColumn] doubleValue];
if (self.contentHeight < maxColumnHeight) {
self.contentHeight = maxColumnHeight;
}
return attrs;
}
/**
* 决定cell的高度
*/
- (NSArray<UICollectionViewLayoutAttributes *> *)layoutAttributesForElementsInRect:(CGRect)rect{
return self.attrsArr;
}
/**
* 内容的高度
*/
- (CGSize)collectionViewContentSize{
// CGFloat maxColumnHeight = [self.columnHeights[0] doubleValue];
// for (int i = 0; i < LMHDefaultColunmCount; i++) {
//
// // 取得第i列的高度
// CGFloat columnHeight = [self.columnHeights[i] doubleValue];
//
// if (maxColumnHeight < columnHeight) {
// maxColumnHeight = columnHeight;
// }
//
// }
return CGSizeMake(0, self.contentHeight + self.edgeInsets.bottom);
}
@end
ColorfulSchool/ColorfulSchool/Classes/AliMaMa/LZNCollectionViewFlowLayout.h 0 → 100644
//
// LZNCollectionViewFlowLayout.h
// ThirdTask－瀑布流
//
// Created by linzhennan on 16/3/21.
// Copyright © 2016年 Zhennan Lin. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface LZNCollectionViewFlowLayout : UICollectionViewLayout
@property (nonatomic, assign) id<UICollectionViewDelegateFlowLayout> delegate;
@property (nonatomic, assign) NSUInteger cellCount; // cell 的个数
@property (nonatomic, strong) NSMutableArray *cellHeightArray;
@property (nonatomic, strong) NSMutableDictionary *cellAttributeDict; // cell 的位置信息
/**
* @author Paul Wang, 16-03-10 20:03:19
*
* @brief 构造方法，用于特殊高度的 headerView
*
* @param topHeight 顶高度
*
* @return
*/
- (instancetype)initWithTopHeight:(CGFloat)topHeight;
@end
ColorfulSchool/ColorfulSchool/Classes/AliMaMa/LZNCollectionViewFlowLayout.m 0 → 100644
//
// LZNCollectionViewFlowLayout.m
// ThirdTask－瀑布流
//
// Created by linzhennan on 16/3/21.
// Copyright © 2016年 Zhennan Lin. All rights reserved.
//
#import "LZNCollectionViewFlowLayout.h"
@interface LZNCollectionViewFlowLayout () {
CGFloat _topHeight;
}
@end
@implementation LZNCollectionViewFlowLayout
- (instancetype)initWithTopHeight:(CGFloat)topHeight {
self = [super init];
if (self) {
_topHeight = topHeight;
}
return self;
}
- (void)prepareLayout {
[super prepareLayout];
_cellHeightArray = [NSMutableArray array];
_cellAttributeDict = [NSMutableDictionary dictionary];
_delegate = (id<UICollectionViewDelegateFlowLayout>)self.collectionView.delegate;
// 获取cell的个数
_cellCount = [self.collectionView numberOfItemsInSection:0];
if (_cellCount == 0) {
return;
}
float top = _topHeight;
for (NSInteger i = 0; i < 2; i++) {
[_cellHeightArray addObject:@(top)];
}
// 调用layoutForItemAtIndexPath方法，为每个cell布局，
for (NSInteger i = 0; i < _cellCount; i ++) {
[self layoutItemAtIndexPath:[NSIndexPath indexPathForItem:i inSection:0]];
}
}
- (void)layoutItemAtIndexPath:(NSIndexPath *)indexPath {
// 通过协议获得cell的间隙
UIEdgeInsets edgeInsets = [self.delegate collectionView:self.collectionView layout:self insetForSectionAtIndex:indexPath.row];
// 通过协议获得cell的大小
CGSize itemSize = [self.delegate collectionView:self.collectionView layout:self sizeForItemAtIndexPath:indexPath];
NSInteger column = 0;
float shortHeight = [[_cellHeightArray objectAtIndex:column] floatValue];
//找出高度最小的列，将cell加到最小列中
for (int i = 0; i < _cellHeightArray.count; i++) {
float height = [[_cellHeightArray objectAtIndex:i] floatValue];
if (height < shortHeight) {
shortHeight = height;
column = i;
}
}
float top = [[_cellHeightArray objectAtIndex:column] floatValue];
//确定cell的frame
CGRect frame = CGRectMake(edgeInsets.left + column * (edgeInsets.left + itemSize.width), top + edgeInsets.top, itemSize.width, itemSize.height);
//更新列高
[_cellHeightArray replaceObjectAtIndex:column withObject:[NSNumber numberWithFloat:top + edgeInsets.top + itemSize.height]];
//每个cell的frame对应一个indexPath，放入字典中
[_cellAttributeDict setObject:NSStringFromCGRect(frame) forKey:indexPath];
}
//返回cell的布局信息，如果忽略传入的rect一次性将所有的cell布局信息返回，图片过多时性能会很差
- (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect {
NSMutableArray *muArr = [NSMutableArray array];
for (NSIndexPath *indexPath in _cellAttributeDict) {
CGRect cellRect = CGRectFromString(_cellAttributeDict[indexPath]);
if (CGRectIntersectsRect(cellRect, rect)) {
UICollectionViewLayoutAttributes *attributes = [self layoutAttributesForItemAtIndexPath:indexPath];
[muArr addObject:attributes];
}
}
return muArr;
}
- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath {
UICollectionViewLayoutAttributes *attributes = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
attributes.frame = CGRectFromString(_cellAttributeDict[indexPath]);
return attributes;
}
//最后还要实现这个方法，返回collectionView内容的大小
//只需要遍历前面创建的存放列高的数组得到列最高的一个作为高度返回就可以了
- (CGSize)collectionViewContentSize {
CGSize size = self.collectionView.frame.size;
float maxHeight = 0;
// 查找最高的列的高度
for (int i = 0; i < _cellHeightArray.count; i++) {
float colHeight = [[_cellHeightArray objectAtIndex:i] floatValue];
if (colHeight > maxHeight) {
maxHeight = colHeight;
}
}
size.height = maxHeight;
return size;
}
@end
ColorfulSchool/ColorfulSchool/Classes/AliMaMa/ZXAliMaMaViewController.m
......@@ -9,15 +9,14 @@
#import "ZXAliMaMaViewController.h"
#import "ZXAdViewService.h"
#import "ZXAlimamaModel.h"
#import "LMHWaterFallLayout.h"
#import "ZXAlimamaCollectionViewCell.h"
#import "ZXBannerJumpViewController.h"
#import "enlargeClickRegionBtn.h"
#import "ZXAliMaRecomondModel.h"
#import "ZXAliMaRecomondModel.h"
#import "LZNCollectionViewFlowLayout.h"
static NSString * const LMHShopId = @"shop";
@interface ZXAliMaMaViewController ()<UICollectionViewDataSource, LMHWaterFallLayoutDeleaget, UICollectionViewDelegate>
@interface ZXAliMaMaViewController ()<UICollectionViewDataSource, UICollectionViewDelegate>
/** 所有的商品数据 */
@property (nonatomic, strong) NSMutableArray * shops;
......@@ -119,11 +118,12 @@ static NSString * const LMHShopId = @"shop";
- (void)setupLayoutAndCollectionView{
// 创建布局
LMHWaterFallLayout * waterFallLayout = [[LMHWaterFallLayout alloc]init];
waterFallLayout.delegate = self;
// LMHWaterFallLayout * waterFallLayout = [[LMHWaterFallLayout alloc]init];
// waterFallLayout.delegate = self;
LZNCollectionViewFlowLayout *flow = [[LZNCollectionViewFlowLayout alloc] init];
flow.delegate = self;
// 创建collectionView
UICollectionView * collectionView = [[UICollectionView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight - kTabBarHeight - 30 * k6Scale) collectionViewLayout:waterFallLayout];
UICollectionView * collectionView = [[UICollectionView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight - kTabBarHeight - 30 * k6Scale) collectionViewLayout:flow];
collectionView.backgroundColor = [UIColor whiteColor];
collectionView.dataSource = self;
......@@ -253,49 +253,38 @@ static NSString * const LMHShopId = @"shop";
}
#pragma mark - <LMHWaterFallLayoutDeleaget>
- (CGFloat)waterFallLayout:(LMHWaterFallLayout *)waterFallLayout heightForItemAtIndexPath:(NSUInteger)indexPath itemWidth:(CGFloat)itemWidth{
return 245 * k6Scale;
#pragma mark - UICollectionViewDelegateFlowLayout
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
return CGSizeMake((kScreenWidth - 30 * k6Scale) / 2.0f, 245 * k6Scale);
}
- (CGFloat)rowMarginInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout{
return 10;
-(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section {
return UIEdgeInsetsMake(10 * k6Scale, 10 * k6Scale, 10 * k6Scale, 10 * k6Scale);
}
- (NSUInteger)columnCountInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout{
return 2;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
if ([self.titleStr isEqualToString:@"推荐"]) {
ZXAliMaRecomondModel *recom = self.shops[indexPath.item];
NSString *url = [NSString stringWithFormat:@"%@/alimama/tbk/dg/material/optional?pageNo=1&q=%@&deviceType=IMEI&deviceValue=02399123192391293123&cat=hot", [kUserDefaults objectForKey:@"HomePage"], recom.title];
NSString *url = [NSString stringWithFormat:@"%@/alimama/tbk/dg/material/optional/forItemId?pageNo=1&q=%@&deviceType=IMEI&deviceValue=02399123192391293123&cat=hot&itemId=%@&hasCoupon=0", [kUserDefaults objectForKey:@"HomePage"], recom.title, recom.num_iid];
[[ZXAdViewService sharedManager] GET:[url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
id res = responseObject[@"data"][@"tbk_dg_material_optional_response"][@"result_list"][@"map_data"];
id res = responseObject[@"data"];
if (res) {
NSArray *list = [ZXAlimamaModel mj_objectArrayWithKeyValuesArray:res];
for (ZXAlimamaModel *item in list) {
if ([item.item_id integerValue] == [recom.num_iid integerValue]) {
dispatch_async(dispatch_get_main_queue(), ^{
NSString *url = [@"taobao:" stringByAppendingString:item.coupon_share_url];
if (res[@"couponShareUrl"]) {
NSString *url = [@"taobao:" stringByAppendingString:res[@"couponShareUrl"]];
NSURL *URL = [NSURL URLWithString:url];
if ([[UIApplication sharedApplication] canOpenURL:URL]) {
[[UIApplication sharedApplication] openURL:URL];
}
} else {
ZXBannerJumpViewController *jumpVc = [[ZXBannerJumpViewController alloc] init];
jumpVc.jumpUrl = [@"https:" stringByAppendingString:item.coupon_share_url];
jumpVc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:jumpVc animated:YES];
if (res[@"url"]) {
NSString *url = [@"taobao:" stringByAppendingString:res[@"url"]];
NSURL *URL = [NSURL URLWithString:url];
if ([[UIApplication sharedApplication] canOpenURL:URL]) {
[[UIApplication sharedApplication] openURL:URL];
}
});
} else {
[ZXTool showText:@"活动已下架，请关注后续活动！"];
}
}
} else {
......
ColorfulSchool/ColorfulSchool/Classes/AliMaMa/ZXSearchViewController.m
......@@ -9,7 +9,7 @@
#import "ZXSearchViewController.h"
#import "ZXAdViewService.h"
#import "ZXAlimamaModel.h"
#import "LMHWaterFallLayout.h"
#import "LZNCollectionViewFlowLayout.h"
#import "ZXAlimamaCollectionViewCell.h"
#import "ZXBannerJumpViewController.h"
#import "enlargeClickRegionBtn.h"
......@@ -17,7 +17,7 @@
#import "ZXFliterView.h"
@interface ZXSearchViewController ()<UICollectionViewDataSource, LMHWaterFallLayoutDeleaget, UICollectionViewDelegate, ZXFliterDelegate>
@interface ZXSearchViewController ()<UICollectionViewDataSource, UICollectionViewDelegate, ZXFliterDelegate>
/** 所有的商品数据 */
@property (nonatomic, strong) NSMutableArray * shops;
......@@ -165,7 +165,7 @@
- (void)setupLayoutAndCollectionView{
// 创建布局
LMHWaterFallLayout * waterFallLayout = [[LMHWaterFallLayout alloc]init];
LZNCollectionViewFlowLayout * waterFallLayout = [[LZNCollectionViewFlowLayout alloc]init];
waterFallLayout.delegate = self;
// 创建collectionView
......@@ -256,23 +256,7 @@
#pragma mark - <LMHWaterFallLayoutDeleaget>
- (CGFloat)waterFallLayout:(LMHWaterFallLayout *)waterFallLayout heightForItemAtIndexPath:(NSUInteger)indexPath itemWidth:(CGFloat)itemWidth{
return 238 * k6Scale;
}
- (CGFloat)rowMarginInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout{
return 10;
}
- (NSUInteger)columnCountInWaterFallLayout:(LMHWaterFallLayout *)waterFallLayout{
return 2;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
ZXAlimamaModel *model = self.shops[indexPath.item];
NSString *url = [@"taobao:" stringByAppendingString:model.coupon_share_url];
......@@ -286,7 +270,13 @@
[self.navigationController pushViewController:jumpVc animated:YES];
}
}
#pragma mark - UICollectionViewDelegateFlowLayout
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
return CGSizeMake((kScreenWidth - 30 * k6Scale) / 2.0f, 245 * k6Scale);
}
-(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section {
return UIEdgeInsetsMake(10 * k6Scale, 10 * k6Scale, 10 * k6Scale, 10 * k6Scale);
}
#pragma mark - filterdelegate
- (void)filterByPrices:(NSInteger)status {
NSString *searchStr = @"";
......
ColorfulSchool/ColorfulSchool/Classes/Config(配置)/APIManager.m
//
//
......@@ -62,13 +62,14 @@ kSINGLETON_FOR_CLASS(APIManager)
// [userDefaults setObject:@"http://192.168.100.112:8888" forKey:@"DCWash"];
[userDefaults setObject:@"8197" forKey:@"DCWashSocketPort"];
[userDefaults setObject:@"2081ad8ddc23576.natapp.cc" forKey:@"DCWashSocketUrl"];
[userDefaults setObject:@"http://dev-task-appserv.168cad.top" forKey:@"Task"];
[userDefaults setObject:@"http://ex-dev-dcxy-static.168cad.top" forKey:@"TaskH5"];
[userDefaults synchronize];
break;
}
case ZXColorfulSchoolEnvironmentTest: {
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
[userDefaults setObject:@"http://internal-test-dcxyapi.168cad.top/dcintsrv/mt/entrance.do" forKey:@"schoolIp"];
[userDefaults setObject:@"internal-test-dcgz-bg-static.168cad.top" forKey:@"RootUrl"];
[userDefaults setObject:@"http://internal-test-dcxyapi.168cad.top/dcintsrv/pay/createAliOrder.do"forKey:@"Ali"];
......@@ -99,7 +100,8 @@ kSINGLETON_FOR_CLASS(APIManager)
[userDefaults setObject:@"http://ex-test-other-device-app.168cad.top" forKey:@"DCWash"];
[userDefaults setObject:@"8197" forKey:@"DCWashSocketPort"];
[userDefaults setObject:@"12081ad8ddc23576.natapp.cc" forKey:@"DCWashSocketUrl"];
[userDefaults setObject:@"http://test-task-appserv.168cad.top" forKey:@"Task"];
[userDefaults setObject:@"http://ex-test-dcxy-static.168cad.top" forKey:@"TaskH5"];
[userDefaults synchronize];
break;
}
......@@ -145,6 +147,8 @@ kSINGLETON_FOR_CLASS(APIManager)
[userDefaults setObject:@"8005" forKey:@"DCWashSocketPort"];
[userDefaults setObject:@"other-tcp-mobile.dcrym.com" forKey:@"DCWashSocketUrl"];
[userDefaults setObject:@"http://product-task-appserv.168cad.top" forKey:@"Task"];
[userDefaults setObject:@"http://ex-dev-dcxy-static.168cad.top" forKey:@"TaskH5"];
[userDefaults synchronize];
break;
}
......
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/CustomerTabbar.h
//
//
......@@ -22,4 +22,10 @@
@property (nonatomic, strong) NSArray *switchs;
@property(nonatomic, weak) id<didSelectItemActionDelegate> delegate;
/** 当前选中的title */
@property (nonatomic, copy) NSString *buttonTitle;
@end
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/CustomerTabbar.m
//
//
......@@ -10,7 +10,8 @@
#import "JXLayoutButton.h"
@interface CustomerTabbar()
/** */
@property (nonatomic, strong) JXLayoutButton *currentButton;
@property (nonatomic, assign) int currentIndex;
@property (nonatomic, strong) UIView *maskView;
@end
......@@ -53,6 +54,10 @@
[titleArray addObject:@"短视频"];
[imagesArray addObject:@"nav_video_nor"];
[selectImagesArray addObject:@"nav_video_sel"];
} else if ([dic[@"type"] isEqualToString:@"14"]) {
[titleArray addObject:@"任务"];
[imagesArray addObject:@"nav_video_nor"];
[selectImagesArray addObject:@"nav_video_sel"];
}
}
if (isHasSc) {
......@@ -72,9 +77,16 @@
btn.frame = CGRectMake(W * i, 0, W, 49);
@weakify(self);
[[btn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(JXLayoutButton *x) {
currentBtn.enabled = YES;
if ([title isEqualToString:@"商城"]) {
if ([self.delegate respondsToSelector:@selector(selectPageIndex:fromIndex:)]) {
[self.delegate selectPageIndex:4 fromIndex:self.currentIndex];
}
self.currentIndex = 4;
} else {
self.currentButton.enabled = YES;
x.enabled = NO;
currentBtn = x;
self.currentButton = x;
@strongify(self);
if ([title isEqualToString:@"多彩"]) {
if ([self.delegate respondsToSelector:@selector(selectPageIndex:fromIndex:)]) {
......@@ -96,20 +108,22 @@
[self.delegate selectPageIndex:3 fromIndex:self.currentIndex];
}
self.currentIndex = 3;
} else if ([title isEqualToString:@"商城"]) {
if ([self.delegate respondsToSelector:@selector(selectPageIndex:fromIndex:)]) {
[self.delegate selectPageIndex:4 fromIndex:self.currentIndex];
}
self.currentIndex = 4;
} else if ([title isEqualToString:@"我的"]) {
if ([self.delegate respondsToSelector:@selector(selectPageIndex:fromIndex:)]) {
[self.delegate selectPageIndex:5 fromIndex:self.currentIndex];
}
self.currentIndex = 5;
} else if ([title isEqualToString:@"任务"]) {
if ([self.delegate respondsToSelector:@selector(selectPageIndex:fromIndex:)]) {
[self.delegate selectPageIndex:6 fromIndex:self.currentIndex];
}
self.currentIndex = 6;
}
}
}];
if (i==0) {
currentBtn = btn;
self.currentButton = btn;
btn.enabled = NO;
self.currentIndex = 0;
}
......@@ -132,6 +146,24 @@
return button;
}
- (void)setButtonTitle:(NSString *)buttonTitle {
_buttonTitle = buttonTitle;
if (![buttonTitle isEqualToString:@"商城"]) {
for (int i = 0; i < self.subviews.count; i++) {
JXLayoutButton *button = self.subviews[i];
button.enabled = YES;
if ([button.titleLabel.text isEqualToString:buttonTitle]) {
self.currentIndex = 2;
button.enabled = NO;
self.currentButton = button;
}
}
}
}
@end
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController+Extension.m
//
//
......@@ -526,27 +526,18 @@
return;
}
NSString *url = [NSString stringWithFormat:@"%@/alimama/tbk/dg/material/optional?pageNo=1&q=%@&deviceType=IMEI&deviceValue=02399123192391293123&cat=hot", [kUserDefaults objectForKey:@"HomePage"], dic[@"title"]];
NSString *url = [NSString stringWithFormat:@"%@/alimama/tbk/dg/material/optional/forItemId?pageNo=1&q=%@&deviceType=IMEI&deviceValue=02399123192391293123&cat=hot&itemId=%@&hasCoupon=0", [kUserDefaults objectForKey:@"HomePage"], dic[@"title"], item_id];
[[ZXAdViewService sharedManager] GET:[url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
id res = responseObject[@"data"][@"tbk_dg_material_optional_response"][@"result_list"][@"map_data"];
id res = responseObject[@"data"];
if (res) {
NSArray *list = [ZXAlimamaModel mj_objectArrayWithKeyValuesArray:res];
__block ZXAlimamaModel *m;
for (ZXAlimamaModel *item in list) {
if ([item.item_id integerValue] == [item_id integerValue]) {
m = item;
}
}
if (m) {
[self jumpTaobaoWithItem:m];
if (res[@"couponShareUrl"]) {
[self jumpTaobaoWithItem:res[@"couponShareUrl"]];
} else {
if (list.count) {
[self jumpTaobaoWithItem:list[0]];
if (res[@"url"]) {
[self jumpTaobaoWithItem:res[@"url"]];
} else {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showText:@"活动已下架，请关注后续活动！"];
});
}
}
} else {
......@@ -576,15 +567,15 @@
}
}
- (void) jumpTaobaoWithItem:(ZXAlimamaModel *) item {
- (void) jumpTaobaoWithItem:(NSString *) couponShareUrl {
dispatch_async(dispatch_get_main_queue(), ^{
NSString *url = [@"taobao:" stringByAppendingString:item.coupon_share_url];
NSString *url = [@"taobao:" stringByAppendingString:couponShareUrl];
NSURL *URL = [NSURL URLWithString:url];
if ([[UIApplication sharedApplication] canOpenURL:URL]) {
[[UIApplication sharedApplication] openURL:URL];
} else {
ZXBannerJumpViewController *jumpVc = [[ZXBannerJumpViewController alloc] init];
jumpVc.jumpUrl = [@"https:" stringByAppendingString:item.coupon_share_url];
jumpVc.jumpUrl = [@"https:" stringByAppendingString:couponShareUrl];
jumpVc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:jumpVc animated:YES];
}
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m
//
//
......@@ -34,10 +34,11 @@
#import "AimiWalletViewController.h"
#import "enlargeClickRegionBtn.h"
#import "CropImageController.h"
#import "ZXBDTool.h"
#import "WWWWEbViewController.h"
#import "ZXAdViewService.h"
#import "ZXBannerJumpViewController.h"
#import "ZXTaskViewController.h"
@interface ZXHomePageViewController ()<UITableViewDelegate, UITableViewDataSource, UINavigationControllerDelegate, UIImagePickerControllerDelegate, CropImageDelegate>
/** tableview */
@property (nonatomic, strong) UITableView *myTableView;
......@@ -95,13 +96,13 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeUserNameAction:) name:@"changeUserNameNotification" object:nil];
//测试按钮
// //测试按钮
// UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(50, kScreenHeight - 150, 80, 80)];
// [self.view addSubview:btn];
// btn.backgroundColor = [UIColor orangeColor];
// [[btn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
// WWWWEbViewController *vc = [[WWWWEbViewController alloc] init];
// vc.jumpUrl = @"https://cpu.baidu.com/1032/ed6b6847?scid=43624";
// ZXTaskViewController *vc = [[NSClassFromString(@"ZXTaskViewController") alloc] init];
// [self.navigationController pushViewController:vc animated:YES];
// }];
......@@ -165,8 +166,62 @@
[ExpecptionModel clearTable];
}
}
}
//查看任务相关内容
@weakify(self);
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/dcxy/api/tasks/homePage", [kUserDefaults objectForKey:@"Task"]] para:nil completed:^(CommonModel *common, NSString *error) {
@strongify(self);
if ([common.data boolValue]) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
[self showTaskDialog];
});
}
}];
}
#pragma mark - 显示领券弹窗
- (void) showTaskDialog {
UIView *taskBgView = [[UIView alloc] initWithFrame:UIScreen.mainScreen.bounds];
[kAppWindow addSubview:taskBgView];
taskBgView.backgroundColor = kRGBColor(0, 0, 0, 0.4);
UIImage *image = [UIImage imageNamed:@"task_home"];
UIImageView *imageV = [[UIImageView alloc] init];
imageV.image = image;
imageV.userInteractionEnabled = YES;
[taskBgView addSubview:imageV];
[imageV mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(taskBgView.mas_centerX);
make.top.equalTo(taskBgView.mas_top).offset(kTopHeight + 70 * k6Scale);
make.width.mas_equalTo(355 * k6Scale);
make.height.mas_equalTo(355 * k6Scale * image.size.height / image.size.width);
}];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
[imageV addGestureRecognizer:tap];
@weakify(self);
[[tap rac_gestureSignal] subscribeNext:^(id x) {
@strongify(self);
ZXTaskViewController *taskVc = [[ZXTaskViewController alloc] init];
taskVc.jumpUrl = [NSString stringWithFormat:@"%@/taskApp/coupon.html?token=%@", [kUserDefaults objectForKey:@"TaskH5"], CacheToken];
taskVc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:taskVc animated:YES];
}];
enlargeClickRegionBtn *closeButton = [[enlargeClickRegionBtn alloc] init];
[taskBgView addSubview:closeButton];
[closeButton setBackgroundImage:[UIImage imageNamed:@"task_close"] forState:UIControlStateNormal];
[closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(31 * k6Scale);
make.centerX.equalTo(taskBgView);
make.top.equalTo(imageV.mas_bottom);
}];
[[closeButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
taskBgView.hidden = YES;
[taskBgView removeFromSuperview];
}];
}
- (UITableView *)myTableView {
if (_myTableView== nil) {
CGFloat bottomH = 0;
......@@ -174,7 +229,7 @@
bottomH = 34;
}
_myTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kTopHeight + 13 * k6Scale, kScreenWidth, kScreenHeight - bottomH - 49 - kTopHeight - 13 * k6Scale) style:UITableViewStyleGrouped];
// _myTableView.contentInset = UIEdgeInsetsMake(6 * k6Scale, 0, 0, 0);
// _myTableView.contentInset = UIEdgeInsetsMake(6 * k6Scale, 0, 0, 0);
_myTableView.delegate = self;
_myTableView.dataSource = self;
_myTableView.showsHorizontalScrollIndicator = NO;
......@@ -255,10 +310,10 @@
NSArray *arr = self.service.dataSource[section];
return arr.count?1:0;
}
// ZXHomeChildInfo *child = sec.blockData.firstObject;
// if (child && [child.blockType isEqualToString:@"3"]) {
// return 1;
// }
// ZXHomeChildInfo *child = sec.blockData.firstObject;
// if (child && [child.blockType isEqualToString:@"3"]) {
// return 1;
// }
return sec.blockData.count;
}
- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/2.0条码/ZXSelfHelpViewController.m
//
//
......@@ -13,15 +13,14 @@
#import "SDCycleScrollView.h"
#import "ZXAdViewAdTool.h"
#import "BUADTool.h"
#import <BUAdSDK/BUAdSDK.h>
#import "ZXBDTool.h"
@interface ZXSelfHelpViewController ()<BUNativeExpressBannerViewDelegate> {
@interface ZXSelfHelpViewController () {
enlargeClickRegionBtn *showCode;
}
/** banner广澳 */
@property (nonatomic, strong) BUNativeExpressBannerView *bannerView;
@property (nonatomic, strong) dispatch_source_t gcdTimer;
/**
......@@ -82,8 +81,30 @@
[self createBannerView];
[self createCodeView];
if ([[kUserDefaults objectForKey:kAPP_SELP_ADVIEW_SHOW] isEqualToString:@"yes"]) {
[[[BUADTool alloc] init] loadBannerAdWithController:self];
UIView *adSuperView = [[UIView alloc] init];
[self.view addSubview:adSuperView];
adSuperView.backgroundColor = UIColor.whiteColor;
[adSuperView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.height.mas_equalTo(kScreenWidth * 0.3 + 10 * k6Scale);
}];
enlargeClickRegionBtn *closeButton = [[enlargeClickRegionBtn alloc] init];
[closeButton setBackgroundImage:[UIImage imageNamed:@"task_close"] forState:UIControlStateNormal];
[adSuperView addSubview:closeButton];
[closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.top.equalTo(adSuperView);
make.width.height.mas_equalTo(20 * k6Scale);
}];
[adSuperView bringSubviewToFront:closeButton];
[[closeButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
adSuperView.hidden = YES;
[adSuperView removeFromSuperview];
}];
[[ZXBDTool new] createNativie20_3AdByView:adSuperView];
[[[BUADTool alloc] init] loadBannerAdWithController:self superView:adSuperView];
}
......@@ -381,42 +402,5 @@
#pragma BUNativeExpressBannerViewDelegate
- (void)nativeExpressBannerAdViewDidLoad:(BUNativeExpressBannerView *)bannerAdView {
NSLog(@"%s",__func__);
}
- (void)nativeExpressBannerAdView:(BUNativeExpressBannerView *)bannerAdView didLoadFailWithError:(NSError *)error {
NSLog(@"%s",__func__);
}
- (void)nativeExpressBannerAdViewRenderSuccess:(BUNativeExpressBannerView *)bannerAdView {
NSLog(@"%s",__func__);
}
- (void)nativeExpressBannerAdViewRenderFail:(BUNativeExpressBannerView *)bannerAdView error:(NSError *)error {
NSLog(@"%s",__func__);
}
- (void)nativeExpressBannerAdViewWillBecomVisible:(BUNativeExpressBannerView *)bannerAdView {
NSLog(@"%s",__func__);
}
- (void)nativeExpressBannerAdViewDidClick:(BUNativeExpressBannerView *)bannerAdView {
NSLog(@"%s",__func__);
}
- (void)nativeExpressBannerAdView:(BUNativeExpressBannerView *)bannerAdView dislikeWithReason:(NSArray<BUDislikeWords *> *)filterwords {
NSLog(@"%s",__func__);
[UIView animateWithDuration:0.25 animations:^{
bannerAdView.alpha = 0;
} completion:^(BOOL finished) {
[bannerAdView removeFromSuperview];
if (self.bannerView == bannerAdView) {
self.bannerView = nil;
}
}];
}
@end
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/WashClose(多彩洗衣)/Controller/DC_ZXWashOrderDetailViewController.m
//
//
......@@ -78,9 +78,7 @@
}];
__weak typeof(self) weakSelf = self;
[[back rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
[self.bluetoothManager cutBluetoothAndSocketConnect];
self.bluetoothManager.delegate = nil;
self.bluetoothManager = nil;
[weakSelf.navigationController popViewControllerAnimated:YES];
}];
......@@ -246,5 +244,14 @@
- (void) connectBluetoothFaliure {
self.okPayButton.enabled = YES;
}
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
[self.bluetoothManager cutBluetoothAndSocketConnect];
self.bluetoothManager.delegate = nil;
self.bluetoothManager = nil;
}
- (void)dealloc {
NSLog(@"%s", __func__);
}
@end
ColorfulSchool/ColorfulSchool/Classes/Task(任务)/ZXTaskManager.h 0 → 100644
//
//
// ZXTaskManager.h
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/11/26.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface ZXTaskManager : NSObject
kSINGLETON_FOR_HEADER(ZXTaskManager)
/** task */
@property (nonatomic, copy) NSString *taskCode;
/** 任务状态 0失败 1已完成(未上报) 2已上报*/
@property (nonatomic, assign) NSInteger status;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/Task(任务)/ZXTaskManager.m 0 → 100644
//
//
// ZXTaskManager.m
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/11/26.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "ZXTaskManager.h"
@implementation ZXTaskManager
kSINGLETON_FOR_CLASS(ZXTaskManager)
@end
ColorfulSchool/ColorfulSchool/Classes/Task(任务)/ZXTaskViewController.h 0 → 100644
//
//
// ZXTaskViewController.h
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/11/22.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface ZXTaskViewController : UIViewController
/** jumpUrl */
@property (nonatomic, copy) NSString *jumpUrl;
/** 是否是任务首页 */
@property (nonatomic, assign) NSInteger isTaskHomePage;
/** 状态栏颜色 */
@property (nonatomic, copy) NSString *colorHex;
/** 跳转淘宝惠购 */
@property (nonatomic, copy) dispatch_block_t jumpTaobaoHJ;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/Task(任务)/ZXTaskViewController.m 0 → 100644
//
//
// ZXTaskViewController.m
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/11/22.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "ZXTaskViewController.h"
#import <WebKit/WebKit.h>
#import "BUADTool.h"
#import <BUAdSDK/BUAdSDK.h>
#import "BaiduMobAdSDK/BaiduMobAdRewardVideo.h"
#import "BaiduMobAdSDK/BaiduMobAdSetting.h"
#import "enlargeClickRegionBtn.h"
#import "ZXBDTool.h"
#import "ZXTaskManager.h"
@interface ZXTaskViewController ()<WKNavigationDelegate, WKUIDelegate, WKScriptMessageHandler, BUNativeExpressRewardedVideoAdDelegate, BaiduMobAdRewardVideoDelegate>
/** */
@property (nonatomic, strong) WKWebView *webView;
/** */
@property (nonatomic, strong) NSArray *indentifierList;
@property (nonatomic, strong) BUNativeExpressRewardedVideoAd *rewardedAd;
@property (nonatomic, strong) BaiduMobAdRewardVideo *reward;
/** 回调H5的方法名 */
@property (nonatomic, copy) NSString *jsFuncName;
/** */
@property (nonatomic, copy) NSString *wxCode;
@end
@implementation ZXTaskViewController
- (void)viewDidLoad {
[super viewDidLoad];
UIView *stautus = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kStatusBarHeight)];
[self.view addSubview:stautus];
stautus.backgroundColor = [UIColor colorWithHexString:self.colorHex?self.colorHex:@"#ff5252"];
[self initWebView];
[self addBannerAd];//添加广告
[self preloadCSJRewardAd];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(aouthSuccess:) name:kWX_AUTH_RESULT object:nil];
}
#pragma mark - ========== webView初始化逻辑 ==========
- (void) initWebView {
self.view.backgroundColor = [UIColor whiteColor];
CGFloat bottom = 0;
if (self.isTaskHomePage) {
bottom = kTabBarHeight;
}
self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kStatusBarHeight, kScreenWidth, kScreenHeight - kStatusBarHeight - bottom)];
self.webView.backgroundColor = [UIColor whiteColor];
self.webView.UIDelegate = self;
self.webView.navigationDelegate = self;
[self.view addSubview:self.webView];
self.webView.scrollView.scrollEnabled = NO;
if (@available(iOS 11.0, *)) {
self.webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
}
if (self.jumpUrl == nil) {
self.jumpUrl = [NSString stringWithFormat:@"%@/taskApp?token=%@", [kUserDefaults objectForKey:@"TaskH5"],CacheToken];
}
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.jumpUrl]]];
[ZXTool showLoadingAnimation];
}
#pragma mark - 添加广告
- (void) addBannerAd {
CGFloat Y = kScreenHeight - (kScreenWidth * 0.3 + 10 * k6Scale);
if (self.isTaskHomePage) {
Y = Y - kTabBarHeight;
}
UIView *adSuperView = [[UIView alloc] initWithFrame:CGRectMake(0, Y, kScreenWidth, kScreenWidth * 0.3 + 10 * k6Scale)];
[self.view addSubview:adSuperView];
adSuperView.backgroundColor = UIColor.whiteColor;
enlargeClickRegionBtn *closeButton = [[enlargeClickRegionBtn alloc] initWithFrame:CGRectMake(kScreenWidth - 20 * k6Scale, 0, 20 * k6Scale, 20 * k6Scale)];
[closeButton setBackgroundImage:[UIImage imageNamed:@"task_close"] forState:UIControlStateNormal];
[adSuperView addSubview:closeButton];
[[closeButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
adSuperView.hidden = YES;
[adSuperView removeFromSuperview];
}];
[[[ZXBDTool alloc] init] createNativie20_3AdByView:adSuperView];
[[[BUADTool alloc] init] loadBannerAdWithController:self superView:adSuperView];
}
#pragma mark - ========== 加载失败的时候 创建holder ==========
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
[ZXTool hideLoadingAnimation];
}
#pragma mark - ========== webview相关代理 ==========
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
[ZXTool hideLoadingAnimation];
}
#pragma mark - ========== 注册方法列表 ==========
- (NSArray *)indentifierList {
if (!_indentifierList) {
_indentifierList = @[@"pushNewRoute",//拉起页面
@"goBack",//后退
@"missionStart",//开始任务
@"missionCompletedHandle",//领券弹窗
@"wechatAuth",//微信绑定
@"drawCash", //提现
];
}
return _indentifierList;
}
#pragma mark - ==========JS 调用 OC ==========
- (void)ba_JS_OC {
//重新绑定
for (NSString *str in self.indentifierList) {
[self.webView.configuration.userContentController addScriptMessageHandler:self name:str];
}
}
#pragma mark - ========== js交互 ==========
- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
if ([message.name isEqualToString:self.indentifierList[0]]) {
/*拉起页面*/
NSLog(@"%@", message);
NSArray *arr = message.body;
NSLog(@"%@", arr);
NSString *pushPath = message.body[0];//push出的页面的路径
NSString *statusColor = message.body[1];//跳转页面的状态蓝颜色
ZXTaskViewController *task = [[ZXTaskViewController alloc] init];
task.jumpUrl = [NSString stringWithFormat:@"%@%@?token=%@", [kUserDefaults objectForKey:@"TaskH5"], pushPath, CacheToken];
task.colorHex = statusColor;
[self.navigationController pushViewController:task animated:YES];
} else if ([message.name isEqualToString:self.indentifierList[1]]) {
/*后退*/
[self.webView goBack];
[self.navigationController popViewControllerAnimated:YES];
} else if ([message.name isEqualToString:self.indentifierList[2]]) {
/*开始任务 missionStart(callbackName: 'missonDoneCallback', type: 1,taskCode:''，address：'',thirdId:'' ) 任务类型 1：视频； 2：自编内容； 3：内部跳转； 4： 外部跳转； 5：呼起第三方*/
NSLog(@"%@", message);
NSArray *arr = message.body;
NSString *classStr = arr[3];
NSInteger taskType = [arr[1] integerValue];
if (taskType == 3 && ([classStr isEqualToString:@""] || classStr == nil)) {
return;
}
self.jsFuncName = arr[0];
[ZXTaskManager sharedZXTaskManager].taskCode = arr[2];
switch (taskType) {
case 1: {//激励视频
[self taskRewardVideo];
break;
}
case 2: {//自编内容
break;
}
case 3: {//内部跳转---淘宝惠购
if (classStr && ![classStr isEqualToString:@""]) {
if ([classStr isEqualToString:@"ZXAliMaMaViewController"]) {
//跳转淘宝惠购
if (self.jumpTaobaoHJ) {
self.jumpTaobaoHJ();
}
} else {
UIViewController *vc = [[NSClassFromString(classStr) alloc] init];
vc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:vc animated:YES];
}
}
break;
}
case 4: {//外部跳转
break;
}
case 5: {//呼起第三方
break;
}
default:
break;
}
NSLog(@"%@", arr);
} else if ([message.name isEqualToString:self.indentifierList[3]]) {//领券
} else if ([message.name isEqualToString:self.indentifierList[4]]) {//微信授权
NSArray *arr = message.body;
self.jsFuncName = arr[0];
[WXApi registerApp:@"wx41cd01f1eb664e21" enableMTA:YES];
SendAuthReq *req = [[SendAuthReq alloc] init];
req.scope = @"snsapi_message,snsapi_userinfo,snsapi_friend,snsapi_contact";
req.openID = @"wx41cd01f1eb664e21";
req.state = @"1";
[WXApi sendReq:req];
} else if ([message.name isEqualToString:self.indentifierList[5]]) {//提现
NSArray *arr = message.body;
self.jsFuncName = arr[0];
NSString *money = arr[1];
NSString *IP = [ZXTool getCurentLocalIP];
NSString *signStr = [NSString stringWithFormat:@"%@clientIp%@money%@", CacheUserId, IP, money];
NSDictionary *dic = @{@"clientIp":IP, @"money":money, @"sign":[[ZXTool md5:signStr] uppercaseString]};
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/customer/balance/draw/cash", [kUserDefaults objectForKey:@"Task"]] para:dic completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
} else {
[self.webView evaluateJavaScript:[NSString stringWithFormat:@"%@()", self.jsFuncName] completionHandler:^(id _Nullable res, NSError * _Nullable error) {
}];
}
});
}];
}
}
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
self.navigationController.navigationBar.hidden = NO;
NSLog(@"已经清理所有的绑定");
for (NSString *str in self.indentifierList) {
[self.webView.configuration.userContentController removeScriptMessageHandlerForName:str];
}
if (@available(iOS 11, *)) {
UIScrollView.appearance.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAutomatic;
}
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
self.navigationController.navigationBar.hidden = YES;
self.tabBarController.tabBar.hidden = !self.isTaskHomePage;
//注册绑定方法列表
[self ba_JS_OC];
//如果有任务id 代表还有任务完成需要提示
if (ZXTaskManager.sharedZXTaskManager.taskCode && ![ZXTaskManager.sharedZXTaskManager.taskCode isEqualToString:@""]) {
[self taskCompleted];
}
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
- (void)dealloc {
NSLog(@"%s", __func__);
self.webView.UIDelegate = nil;
self.webView.navigationDelegate = nil;
}
#pragma mark - 预加载穿山视频
- (void) preloadCSJRewardAd {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
BURewardedVideoModel *model = [[BURewardedVideoModel alloc] init];
model.userId = @"123";
self.rewardedAd = [[BUNativeExpressRewardedVideoAd alloc] initWithSlotID:@"933112439" rewardedVideoModel:model];
self.rewardedAd.delegate = self;
[self.rewardedAd loadAdData];
//为保证播放流畅和展示流畅建议可在收到渲染成功和视频下载完成回调后再展示视频。
});
}
#pragma mark - 显示穿山甲激励视频
-(void) showCSJRewardVideo {
if (self.rewardedAd.isAdValid) {
[self.rewardedAd showAdFromRootViewController:self.navigationController];
[self.reward load];
} else {
//预加载
[self preloadCSJRewardAd];
}
}
#pragma mark - BUNativeExpressRewardedVideoAdDelegate
- (void)nativeExpressRewardedVideoAdDidLoad:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
//预加载成功
}
- (void)nativeExpressRewardedVideoAd:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd didFailWithError:(NSError *_Nullable)error {
}
- (void)nativeExpressRewardedVideoAdDidDownLoadVideo:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdViewRenderSuccess:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdViewRenderFail:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd error:(NSError *_Nullable)error {
}
- (void)nativeExpressRewardedVideoAdWillVisible:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdDidVisible:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdWillClose:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
//关闭视频
}
- (void)nativeExpressRewardedVideoAdDidClose:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
//已经关闭 重新架子啊一个
}
- (void)nativeExpressRewardedVideoAdDidClick:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
//点击了广告
}
- (void)nativeExpressRewardedVideoAdDidClickSkip:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
- (void)nativeExpressRewardedVideoAdDidPlayFinish:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd didFailWithError:(NSError *_Nullable)error {
//播放完成
}
- (void)nativeExpressRewardedVideoAdServerRewardDidSucceed:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd verify:(BOOL)verify {
}
- (void)nativeExpressRewardedVideoAdServerRewardDidFail:(BUNativeExpressRewardedVideoAd *)rewardedVideoAd {
}
#pragma mark - 任务--激励视频
- (void) taskRewardVideo {
//请求接口 获取视频平台
// [ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/dcxy/api/incentiveVideo/least", [kUserDefaults objectForKey:@"Task"]] para:nil completed:^(CommonModel *common, NSString *error) {
//
// dispatch_async(dispatch_get_main_queue(), ^{
// [ZXTool hideLoadingAnimation];
// if (error) {
// return;
// }
//
// //1腾讯 2百度 3瑞狮 4友盟 5穿山甲
// switch ([common.data integerValue]) {
// case 1: {
//
// break;
// }
// case 2: {
// [self showCSJRewardVideo];
// break;
// }
// case 3: {
//
// break;
// }
// case 4: {
//
// break;
// case 5: {
// [self showCSJRewardVideo];
// break;
// }
// default:
// break;
// }
// }
// });
// }];
[self showCSJRewardVideo];
}
#pragma mark - 任务完成
- (void) taskCompleted {
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/dcxy/api/tasks/%@", [kUserDefaults objectForKey:@"Task"], [ZXTaskManager sharedZXTaskManager].taskCode] para:nil completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error == nil) {
//直接弹
[self callBackToH5WithSuccess:YES];
}
});
}];
}
#pragma mark - 回调前端已经任务完成
- (void) callBackToH5WithSuccess:(BOOL) isSuccess {
//异常情况处理
[self.webView evaluateJavaScript:[NSString stringWithFormat:@"%@('%d', '%@')", self.jsFuncName, isSuccess, [ZXTaskManager sharedZXTaskManager].taskCode] completionHandler:^(id _Nullable res, NSError * _Nullable error) {
//清空taskid
ZXTaskManager.sharedZXTaskManager.taskCode = @"";
}];
}
#pragma mark - 微信授权成功
- (void) aouthSuccess:(NSNotification *) nof {
if ([self.wxCode isEqualToString:nof.object]) {
return;
}
self.wxCode = nof.object;
NSLog(@"请求微信授权登录----%@", self.wxCode);
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/plain"];
[manager GET:[NSString stringWithFormat:@"https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx41cd01f1eb664e21&secret=d709419cf1ba7ed33e6337bd9396bef1&code=%@&grant_type=authorization_code", nof.object] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
self.wxCode = @"";
if (responseObject != nil && responseObject[@"openid"] != nil) {
[self requestUserInfoByToken:responseObject[@"access_token"] andOpenid:responseObject[@"openid"]];
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showText:error.userInfo[@"NSLocalizedDescription"]];
});
}];
}
-(void)requestUserInfoByToken:(NSString *)token andOpenid:(NSString *)openID
{
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.requestSerializer = [AFJSONRequestSerializer serializer];
manager.responseSerializer = [AFHTTPResponseSerializer serializer];
[manager GET:[NSString stringWithFormat:@"https://api.weixin.qq.com/sns/userinfo?access_token=%@&openid=%@",token,openID] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
NSDictionary *dic = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/wx/auth/submit/info", [kUserDefaults objectForKey:@"Task"]] para:@{@"wxInfo":[dic mj_JSONString]} completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
} else {
[self.webView evaluateJavaScript:[NSString stringWithFormat:@"%@()", self.jsFuncName] completionHandler:^(id _Nullable res, NSError * _Nullable error) {
}];
}
});
}];
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
}];
}
@end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
//
//
......@@ -174,4 +174,6 @@ typedef void(^checkIsOldCustomer)(BOOL isOld);
+(void) alimamaTest;
//ip
+ (NSString*)getCurentLocalIP;
@end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
//
//
......@@ -29,7 +29,9 @@
#import "AppDelegate.h"
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
#import <CoreTelephony/CTCarrier.h>
#import <ifaddrs.h>
#import <arpa/inet.h>
#import "ZXFirstPageService.h"
#import "ZXSections.h"
#import "ZXBookMarkModel.h"
......@@ -1763,5 +1765,55 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
}];
}
}
#pragma mark - 获取ip地址
+ (NSString*)getCurentLocalIP{
    NSString*address =nil;
    struct ifaddrs*interfaces =NULL;
    struct ifaddrs*temp_addr =NULL;
    int success =0;
    // retrieve the current interfaces - returns 0 on success
    success =getifaddrs(&interfaces);
    if(success ==0) {
        // Loop through linked list of interfaces
        temp_addr = interfaces;
        while(temp_addr !=NULL) {
            NSLog(@"%d",temp_addr->ifa_addr->sa_family);
            if(temp_addr->ifa_addr->sa_family==AF_INET|| temp_addr->ifa_addr->sa_family==AF_INET6|| temp_addr->ifa_addr->sa_family==AF_LINK) {
                if([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"]) {
                    // Get NSString from C String
                    address = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr)];
                }
            }
            temp_addr = temp_addr->ifa_next;
        }
    }
    // Free memory
    freeifaddrs(interfaces);
    return address;
}
@end
ColorfulSchool/ColorfulSchool/Info.plist
......@@ -2,10 +2,12 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>app需要你开启定位权限</string>
<key>CFBundleDevelopmentRegion</key>
<string>zh_CN</string>
<key>CFBundleDisplayName</key>
<string>多彩校园</string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
......
ColorfulSchool/ColorfulSchool/Main(入口)/Controller/MyTabViewController.m
//
//
......@@ -19,7 +19,7 @@
#import "ZXRSNewsManagerController.h"
#import "ZXMallViewController.h"
#import "ZXBQTViewController.h"
#import "ZXTaskViewController.h"
@interface MyTabViewController ()<didSelectItemActionDelegate>
{
......@@ -31,13 +31,16 @@
XMGNavigationViewController *nav4;
XMGNavigationViewController *nav5;
XMGNavigationViewController *nav6;
XMGNavigationViewController *nav7;
ZXMallViewController *webVC;
//设置默认tabBar选项；
CustomerTabbar *cusTabbar;
}
/** 开关集合 */
@property (nonatomic, strong) NSMutableArray *switchs;
/** */
@property (nonatomic, strong) CustomerTabbar *cusTabbar;
@end
@implementation MyTabViewController
......@@ -91,7 +94,7 @@
//type 1资讯 2商城 3支付配置 4免密开关 5小程序(app不需要) 10阿里妈妈 11百青藤
[self.switchs removeAllObjects];
for (NSDictionary *dic in arr) {
if ([dic[@"type"] isEqualToString:@"1"] || [dic[@"type"] isEqualToString:@"2"] || [dic[@"type"] isEqualToString:@"10"] || [dic[@"type"] isEqualToString:@"11"]) {
if ([dic[@"type"] isEqualToString:@"1"] || [dic[@"type"] isEqualToString:@"2"] || [dic[@"type"] isEqualToString:@"10"] || [dic[@"type"] isEqualToString:@"11"] || [dic[@"type"] isEqualToString:@"14"]) {
if ([dic[@"isEnabled"] integerValue] == 1) {
[self.switchs addObject:dic];
}
......@@ -105,6 +108,8 @@
if ([dic[@"type"] isEqualToString:@"12"] && [dic[@"isEnabled"] integerValue] == 1) {
[kUserDefaults setValue:@"yes" forKey:kAPP_SELP_ADVIEW_SHOW];//默认是no
}
}
dispatch_async(dispatch_get_main_queue(), ^{
[self setupAllTitleButton];
......@@ -134,6 +139,7 @@
@strongify(self);
//MARK:跳转商城
[self selectPageIndex:5 fromIndex:0];
};
nav =[[XMGNavigationViewController alloc]initWithRootViewController:homeView];
......@@ -146,6 +152,7 @@
nav6 = [[XMGNavigationViewController alloc] initWithRootViewController:bqtVc];
nav6.navigationController.navigationBar.hidden = YES;
//资讯
ZXRSNewsManagerController *rsManagerVc = [[ZXRSNewsManagerController alloc] init];
rsManagerVc.isFromTabbar = YES;
......@@ -161,14 +168,27 @@
ZXHomePageMeViewController * mineView = [[ZXHomePageMeViewController alloc]init];
nav3 =[[XMGNavigationViewController alloc]initWithRootViewController:mineView];
ZXTaskViewController *taskVc = [[ZXTaskViewController alloc] init];
taskVc.isTaskHomePage = YES;
nav7 = [[XMGNavigationViewController alloc] initWithRootViewController:taskVc];
taskVc.jumpTaobaoHJ = ^{
@strongify(self);
//MARK:跳转淘宝惠购
self.selectedIndex = 2;
self.cusTabbar.buttonTitle = @"淘宝惠购";
};
nav7.navigationController.navigationBar.hidden = YES;
[self addChildViewController:nav];
[self addChildViewController:nav4];
[self addChildViewController:nav5];
[self addChildViewController:nav6];
[self addChildViewController:nav1];
[self addChildViewController:nav3];
[self addChildViewController:nav7];
nav.interactivePopGestureRecognizer.enabled = NO;
nav1.interactivePopGestureRecognizer.enabled = NO;
nav3.interactivePopGestureRecognizer.enabled = NO;
......@@ -178,15 +198,15 @@
// 设置tabBar上所有按钮内容
- (void)setupAllTitleButton
{
if (cusTabbar == nil) {
cusTabbar = [[CustomerTabbar alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 49)];
cusTabbar.delegate = self;
[self.tabBar addSubview:cusTabbar];
if (self.cusTabbar == nil) {
self.cusTabbar = [[CustomerTabbar alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 49)];
self.cusTabbar.delegate = self;
[self.tabBar addSubview:self.cusTabbar];
}
cusTabbar.switchs = self.switchs;
self.cusTabbar.switchs = self.switchs;
}
- (void)viewWillLayoutSubviews {
[self.tabBar bringSubviewToFront:cusTabbar];
[self.tabBar bringSubviewToFront:self.cusTabbar];
}
-(void)playSound{
NSString *path = [[NSBundle mainBundle] pathForResource:@"like" ofType:@"caf"];
......@@ -229,6 +249,11 @@
if(![nav6.topViewController isKindOfClass:[ZXMallViewController class]]) {
[nav6 pushViewController:webVC animated:YES];
}
} else if (fromIndex == 6) {
if(![nav7.topViewController isKindOfClass:[ZXMallViewController class]]) {
[nav7 pushViewController:webVC animated:YES];
}
} else {
......@@ -241,7 +266,6 @@
} else {
self.selectedIndex=toIndex;
}
}
@end
ColorfulSchool/ColorfulSchool/images.xcassets/Task/Contents.json 0 → 100644
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ColorfulSchool/ColorfulSchool/images.xcassets/Task/cjq.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "任务完成_抽奖券.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "任务完成_抽奖券@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "任务完成_抽奖券@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ColorfulSchool/ColorfulSchool/images.xcassets/Task/task_close.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "首次登录_关闭.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "首次登录_关闭@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "首次登录_关闭@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ColorfulSchool/ColorfulSchool/images.xcassets/Task/task_home.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "首次登录_获得奖券.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "首次登录_获得奖券@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "首次登录_获得奖券@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment