Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
colorfulSchoolReconsitution
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘卓鑫
colorfulSchoolReconsitution
Commits
4f142d2e
Commit
4f142d2e
authored
Sep 07, 2019
by
刘卓鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新版本改动(蓝牙洗衣, 自定义开屏,友盟统计)
parent
3bb2a0a6
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
1568 additions
and
205 deletions
+1568
-205
project.pbxproj
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
+35
-3
UserInterfaceState.xcuserstate
...ata/liuzhuoxin.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
Breakpoints_v2.xcbkptlist
...uzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+0
-62
AppDelegate+Extension.h
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.h
+0
-2
AppDelegate+Extension.m
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.m
+4
-24
AppDelegate.m
ColorfulSchool/ColorfulSchool/AppDelegate.m
+5
-4
TXADHeader.h
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/TXADHeader.h
+20
-0
ZXAdTool.h
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.h
+20
-0
ZXAdTool.m
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.m
+215
-0
ZXFullScreenAdView.h
...School/ColorfulSchool/Classes/AD(广告)/ZXFullScreenAdView.h
+40
-0
ZXFullScreenAdView.m
...School/ColorfulSchool/Classes/AD(广告)/ZXFullScreenAdView.m
+319
-0
ZXLauchModel.h
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXLauchModel.h
+80
-0
ZXLauchModel.m
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXLauchModel.m
+19
-0
ZXTXAdTool.h
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXTXAdTool.h
+40
-0
ZXTXAdTool.m
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXTXAdTool.m
+465
-0
APIManager.m
...rfulSchool/ColorfulSchool/Classes/Config(配置)/APIManager.m
+3
-1
CustomerTabbar.m
.../ColorfulSchool/Classes/CustomViews(自定义)/CustomerTabbar.m
+2
-2
ZXHomePageSupverViewController.m
.../0801HomePage/Controller/ZXHomePageSupverViewController.m
+6
-2
ZXHomePageViewController+Extension.m
...1HomePage/Controller/ZXHomePageViewController+Extension.m
+2
-8
ZXHomePageViewController.m
...ge(首页)/0801HomePage/Controller/ZXHomePageViewController.m
+10
-10
ZXHomePageWebViewController.m
...首页)/0801HomePage/Controller/ZXHomePageWebViewController.m
+2
-2
ZXHomePageSteamCell.m
...omePage(首页)/0801HomePage/View/Cells/ZXHomePageSteamCell.m
+3
-4
ZXHomePageService.m
...s/HomePage(首页)/0801HomePage/ViewModel/ZXHomePageService.m
+5
-5
ZXDrinkViewController.m
...tion(自助服务)/Drink(壁挂饮水)/Controller/ZXDrinkViewController.m
+4
-4
ZXBathViewController.m
...ePage(首页)/Operation(自助服务)/bath(洗浴)/ZXBathViewController.m
+36
-28
ZXWashCloseViewController.m
...务)/washClose(紫宇洗衣)/Controller/ZXWashCloseViewController.m
+7
-7
ZXWashOrderDetailViewController.m
...hClose(紫宇洗衣)/Controller/ZXWashOrderDetailViewController.m
+2
-2
ZXWashTabbarViewController.m
...)/washClose(紫宇洗衣)/Controller/ZXWashTabbarViewController.m
+2
-1
ZXWashOperationCell.m
...peration(自助服务)/washClose(紫宇洗衣)/View/ZXWashOperationCell.m
+6
-2
ZXRegistorViewController.m
...ogin(登录注册)/Register/Controller/ZXRegistorViewController.m
+2
-2
AimiWalletViewController.xib
...(个人中心)/AimiWallet/Controller/AimiWalletViewController.xib
+3
-3
ZXConfirmPayViewController.m
...(个人中心)/AimiWallet/Controller/ZXConfirmPayViewController.m
+3
-2
TopupWalletCell.xib
...lasses/MineView(个人中心)/AimiWallet/View/TopupWalletCell.xib
+3
-3
UserInfoViewController.m
...neView(个人中心)/UserInfo/Controller/UserInfoViewController.m
+5
-1
UserInfoViewController.xib
...View(个人中心)/UserInfo/Controller/UserInfoViewController.xib
+9
-7
ZXTool.h
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
+4
-1
ZXTool.m
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
+10
-1
ZXUMStatisticsManager.h
...l/ColorfulSchool/Classes/Tool(工具)/ZXUMStatisticsManager.h
+28
-0
ZXUMStatisticsManager.m
...l/ColorfulSchool/Classes/Tool(工具)/ZXUMStatisticsManager.m
+40
-0
PrefixHeader.pch
ColorfulSchool/ColorfulSchool/PrefixHeader.pch
+2
-0
Podfile
ColorfulSchool/Podfile
+4
-1
Podfile.lock
ColorfulSchool/Podfile.lock
+14
-1
Manifest.lock
ColorfulSchool/Pods/Manifest.lock
+14
-1
project.pbxproj
ColorfulSchool/Pods/Pods.xcodeproj/project.pbxproj
+0
-0
xcschememanagement.plist
...liuzhuoxin.xcuserdatad/xcschemes/xcschememanagement.plist
+15
-0
Pods-ColorfulSchool-acknowledgements.markdown
...orfulSchool/Pods-ColorfulSchool-acknowledgements.markdown
+15
-0
Pods-ColorfulSchool-acknowledgements.plist
...ColorfulSchool/Pods-ColorfulSchool-acknowledgements.plist
+33
-0
Pods-ColorfulSchool-resources.sh
...iles/Pods-ColorfulSchool/Pods-ColorfulSchool-resources.sh
+3
-0
Pods-ColorfulSchool.adhot.xcconfig
...es/Pods-ColorfulSchool/Pods-ColorfulSchool.adhot.xcconfig
+3
-3
Pods-ColorfulSchool.debug.xcconfig
...es/Pods-ColorfulSchool/Pods-ColorfulSchool.debug.xcconfig
+3
-3
Pods-ColorfulSchool.release.xcconfig
.../Pods-ColorfulSchool/Pods-ColorfulSchool.release.xcconfig
+3
-3
No files found.
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
View file @
4f142d2e
...
@@ -89,6 +89,11 @@
...
@@ -89,6 +89,11 @@
1C8F4A50231E70BD00AAF24A
/* DC_ZXWashOperationViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A31231E70BC00AAF24A
/* DC_ZXWashOperationViewController.m */
;
};
1C8F4A50231E70BD00AAF24A
/* DC_ZXWashOperationViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A31231E70BC00AAF24A
/* DC_ZXWashOperationViewController.m */
;
};
1C8F4A51231E70BD00AAF24A
/* DC_ZXWashOrderDetailViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A32231E70BC00AAF24A
/* DC_ZXWashOrderDetailViewController.m */
;
};
1C8F4A51231E70BD00AAF24A
/* DC_ZXWashOrderDetailViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A32231E70BC00AAF24A
/* DC_ZXWashOrderDetailViewController.m */
;
};
1C8F4A52231E70BD00AAF24A
/* DC_ZXWashRecordViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A34231E70BC00AAF24A
/* DC_ZXWashRecordViewController.m */
;
};
1C8F4A52231E70BD00AAF24A
/* DC_ZXWashRecordViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A34231E70BC00AAF24A
/* DC_ZXWashRecordViewController.m */
;
};
1C8F4A5523209E1600AAF24A
/* ZXBluetootDevicehManager.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A5423209E1600AAF24A
/* ZXBluetootDevicehManager.m */
;
};
1C8F4A5B23212C7500AAF24A
/* ZXLauchModel.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A5A23212C7500AAF24A
/* ZXLauchModel.m */
;
};
1C8F4A61232135F200AAF24A
/* ZXFullScreenAdView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A60232135F200AAF24A
/* ZXFullScreenAdView.m */
;
};
1C8F4A642321EFF800AAF24A
/* ZXAdTool.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A632321EFF800AAF24A
/* ZXAdTool.m */
;
};
1C8F4A672322358000AAF24A
/* ZXUMStatisticsManager.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C8F4A662322358000AAF24A
/* ZXUMStatisticsManager.m */
;
};
1C96F77222F7FA4F002DCA9B
/* ZXHomePageAnnounceView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C96F77122F7FA4F002DCA9B
/* ZXHomePageAnnounceView.m */
;
};
1C96F77222F7FA4F002DCA9B
/* ZXHomePageAnnounceView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C96F77122F7FA4F002DCA9B
/* ZXHomePageAnnounceView.m */
;
};
1C96F77722F80301002DCA9B
/* ZXHomePageUpdateAppView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C96F77622F80301002DCA9B
/* ZXHomePageUpdateAppView.m */
;
};
1C96F77722F80301002DCA9B
/* ZXHomePageUpdateAppView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C96F77622F80301002DCA9B
/* ZXHomePageUpdateAppView.m */
;
};
1C96F77A22F813C4002DCA9B
/* UserManager.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C96F77922F813C4002DCA9B
/* UserManager.m */
;
};
1C96F77A22F813C4002DCA9B
/* UserManager.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1C96F77922F813C4002DCA9B
/* UserManager.m */
;
};
...
@@ -854,6 +859,16 @@
...
@@ -854,6 +859,16 @@
1C8F4A33231E70BC00AAF24A
/* DC_ZXWashScanViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DC_ZXWashScanViewController.h
;
sourceTree
=
"<group>"
;
};
1C8F4A33231E70BC00AAF24A
/* DC_ZXWashScanViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DC_ZXWashScanViewController.h
;
sourceTree
=
"<group>"
;
};
1C8F4A34231E70BC00AAF24A
/* DC_ZXWashRecordViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DC_ZXWashRecordViewController.m
;
sourceTree
=
"<group>"
;
};
1C8F4A34231E70BC00AAF24A
/* DC_ZXWashRecordViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DC_ZXWashRecordViewController.m
;
sourceTree
=
"<group>"
;
};
1C8F4A35231E70BC00AAF24A
/* DC_ZXWashTabbarViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DC_ZXWashTabbarViewController.h
;
sourceTree
=
"<group>"
;
};
1C8F4A35231E70BC00AAF24A
/* DC_ZXWashTabbarViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DC_ZXWashTabbarViewController.h
;
sourceTree
=
"<group>"
;
};
1C8F4A5323209E1600AAF24A
/* ZXBluetootDevicehManager.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXBluetootDevicehManager.h
;
sourceTree
=
"<group>"
;
};
1C8F4A5423209E1600AAF24A
/* ZXBluetootDevicehManager.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ZXBluetootDevicehManager.m
;
sourceTree
=
"<group>"
;
};
1C8F4A5923212C7500AAF24A
/* ZXLauchModel.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXLauchModel.h
;
sourceTree
=
"<group>"
;
};
1C8F4A5A23212C7500AAF24A
/* ZXLauchModel.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ZXLauchModel.m
;
sourceTree
=
"<group>"
;
};
1C8F4A5F232135F100AAF24A
/* ZXFullScreenAdView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXFullScreenAdView.h
;
sourceTree
=
"<group>"
;
};
1C8F4A60232135F200AAF24A
/* ZXFullScreenAdView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ZXFullScreenAdView.m
;
sourceTree
=
"<group>"
;
};
1C8F4A622321EFF800AAF24A
/* ZXAdTool.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXAdTool.h
;
sourceTree
=
"<group>"
;
};
1C8F4A632321EFF800AAF24A
/* ZXAdTool.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ZXAdTool.m
;
sourceTree
=
"<group>"
;
};
1C8F4A652322358000AAF24A
/* ZXUMStatisticsManager.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXUMStatisticsManager.h
;
sourceTree
=
"<group>"
;
};
1C8F4A662322358000AAF24A
/* ZXUMStatisticsManager.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ZXUMStatisticsManager.m
;
sourceTree
=
"<group>"
;
};
1C96F77022F7FA4F002DCA9B
/* ZXHomePageAnnounceView.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXHomePageAnnounceView.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>"
;
};
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>"
;
};
1C96F77522F80301002DCA9B
/* ZXHomePageUpdateAppView.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ZXHomePageUpdateAppView.h
;
sourceTree
=
"<group>"
;
};
...
@@ -2220,6 +2235,8 @@
...
@@ -2220,6 +2235,8 @@
children
=
(
children
=
(
1C8F49FA231E70BA00AAF24A
/* DC_ZXWashService.h */
,
1C8F49FA231E70BA00AAF24A
/* DC_ZXWashService.h */
,
1C8F49F9231E70BA00AAF24A
/* DC_ZXWashService.m */
,
1C8F49F9231E70BA00AAF24A
/* DC_ZXWashService.m */
,
1C8F4A5323209E1600AAF24A
/* ZXBluetootDevicehManager.h */
,
1C8F4A5423209E1600AAF24A
/* ZXBluetootDevicehManager.m */
,
);
);
name
=
ViewModel
;
name
=
ViewModel
;
path
=
../../../../../../../../Desktop/ss/ss/ViewModel
;
path
=
../../../../../../../../Desktop/ss/ss/ViewModel
;
...
@@ -3911,14 +3928,20 @@
...
@@ -3911,14 +3928,20 @@
path
=
"2.0条码"
;
path
=
"2.0条码"
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
A7C579E521DEFD570074DDEA
/*
TX广告
*/
=
{
A7C579E521DEFD570074DDEA
/*
AD(广告)
*/
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
A7C579E621DEFD780074DDEA
/* ZXTXAdTool.h */
,
A7C579E621DEFD780074DDEA
/* ZXTXAdTool.h */
,
A7C579E721DEFD780074DDEA
/* ZXTXAdTool.m */
,
A7C579E721DEFD780074DDEA
/* ZXTXAdTool.m */
,
A7C579E921DEFD8F0074DDEA
/* TXADHeader.h */
,
A7C579E921DEFD8F0074DDEA
/* TXADHeader.h */
,
1C8F4A5923212C7500AAF24A
/* ZXLauchModel.h */
,
1C8F4A5A23212C7500AAF24A
/* ZXLauchModel.m */
,
1C8F4A5F232135F100AAF24A
/* ZXFullScreenAdView.h */
,
1C8F4A60232135F200AAF24A
/* ZXFullScreenAdView.m */
,
1C8F4A622321EFF800AAF24A
/* ZXAdTool.h */
,
1C8F4A632321EFF800AAF24A
/* ZXAdTool.m */
,
);
);
path
=
"
TX广告
"
;
path
=
"
AD(广告)
"
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
A7C64328216F0037003E9AE7
/* GTM */
=
{
A7C64328216F0037003E9AE7
/* GTM */
=
{
...
@@ -3938,7 +3961,7 @@
...
@@ -3938,7 +3961,7 @@
1C3940FB230BC9D5005048EB
/* Found(发现) */
,
1C3940FB230BC9D5005048EB
/* Found(发现) */
,
917B7EC31F3C663100390AE5
/* MineView(个人中心) */
,
917B7EC31F3C663100390AE5
/* MineView(个人中心) */
,
A705BF6721D46FB9004F1628
/* Mall(商城) */
,
A705BF6721D46FB9004F1628
/* Mall(商城) */
,
A7C579E521DEFD570074DDEA
/*
TX广告
*/
,
A7C579E521DEFD570074DDEA
/*
AD(广告)
*/
,
A75436A321D34566005584CC
/* Login(登录注册) */
,
A75436A321D34566005584CC
/* Login(登录注册) */
,
A7DECC6C2079F0E20039EC22
/* Config(配置) */
,
A7DECC6C2079F0E20039EC22
/* Config(配置) */
,
A7DECC712079F0E20039EC22
/* Tool(工具) */
,
A7DECC712079F0E20039EC22
/* Tool(工具) */
,
...
@@ -4095,6 +4118,8 @@
...
@@ -4095,6 +4118,8 @@
A7DECC752079F0E20039EC22
/* ZXPayManager.m */
,
A7DECC752079F0E20039EC22
/* ZXPayManager.m */
,
A7DECC762079F0E20039EC22
/* ZXTool.h */
,
A7DECC762079F0E20039EC22
/* ZXTool.h */
,
A7DECC772079F0E20039EC22
/* ZXTool.m */
,
A7DECC772079F0E20039EC22
/* ZXTool.m */
,
1C8F4A652322358000AAF24A
/* ZXUMStatisticsManager.h */
,
1C8F4A662322358000AAF24A
/* ZXUMStatisticsManager.m */
,
);
);
path
=
"Tool(工具)"
;
path
=
"Tool(工具)"
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
...
@@ -5007,6 +5032,7 @@
...
@@ -5007,6 +5032,7 @@
"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
,
"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
,
"${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle"
,
"${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle"
,
"${PODS_ROOT}/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
,
"${PODS_ROOT}/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
,
"${PODS_ROOT}/UMCCommonLog/UMCommonLog/UMCommonLog.bundle"
,
"${PODS_ROOT}/XRCarouselView/XRCarouselView/XRPlaceholder.png"
,
"${PODS_ROOT}/XRCarouselView/XRCarouselView/XRPlaceholder.png"
,
);
);
name
=
"[CP] Copy Pods Resources"
;
name
=
"[CP] Copy Pods Resources"
;
...
@@ -5015,6 +5041,7 @@
...
@@ -5015,6 +5041,7 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/IQKeyboardManager.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/IQKeyboardManager.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MJRefresh.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MJRefresh.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SVProgressHUD.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SVProgressHUD.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UMCommonLog.bundle"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XRPlaceholder.png"
,
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XRPlaceholder.png"
,
);
);
runOnlyForDeploymentPostprocessing
=
0
;
runOnlyForDeploymentPostprocessing
=
0
;
...
@@ -5165,6 +5192,7 @@
...
@@ -5165,6 +5192,7 @@
22E57B441F8E0864008A753E
/* UIImageView+ABExtras.m in Sources */
,
22E57B441F8E0864008A753E
/* UIImageView+ABExtras.m in Sources */
,
A7BF95002110336C007466F0
/* ZXWisdomLatticeModel.m in Sources */
,
A7BF95002110336C007466F0
/* ZXWisdomLatticeModel.m in Sources */
,
A7F3E19821B5330F00010E23
/* CXMLUnsupportedNode.m in Sources */
,
A7F3E19821B5330F00010E23
/* CXMLUnsupportedNode.m in Sources */
,
1C8F4A5B23212C7500AAF24A
/* ZXLauchModel.m in Sources */
,
A7F3E1AA21B5330F00010E23
/* XDSCatalogueTabBarController.m in Sources */
,
A7F3E1AA21B5330F00010E23
/* XDSCatalogueTabBarController.m in Sources */
,
A7FE8D7C20C8F8100028B721
/* New_ADCell.m in Sources */
,
A7FE8D7C20C8F8100028B721
/* New_ADCell.m in Sources */
,
1C39411C230BC9D5005048EB
/* ZXRSReportViewController.m in Sources */
,
1C39411C230BC9D5005048EB
/* ZXRSReportViewController.m in Sources */
,
...
@@ -5404,7 +5432,9 @@
...
@@ -5404,7 +5432,9 @@
A7FE8D8D20C8FB330028B721
/* JKDBModel.m in Sources */
,
A7FE8D8D20C8FB330028B721
/* JKDBModel.m in Sources */
,
A7079CDB21BE0E3C0063EDCB
/* ZXTextView.m in Sources */
,
A7079CDB21BE0E3C0063EDCB
/* ZXTextView.m in Sources */
,
A75436DA21D34567005584CC
/* MQVerCodeImageView.m in Sources */
,
A75436DA21D34567005584CC
/* MQVerCodeImageView.m in Sources */
,
1C8F4A61232135F200AAF24A
/* ZXFullScreenAdView.m in Sources */
,
A705BF7B21D47FB3004F1628
/* YYImage.m in Sources */
,
A705BF7B21D47FB3004F1628
/* YYImage.m in Sources */
,
1C8F4A5523209E1600AAF24A
/* ZXBluetootDevicehManager.m in Sources */
,
A756C5D121FAA6050006E418
/* TAAbstractDotView.m in Sources */
,
A756C5D121FAA6050006E418
/* TAAbstractDotView.m in Sources */
,
1C96F78022F94804002DCA9B
/* ZXHomePageFeedBackViewController.m in Sources */
,
1C96F78022F94804002DCA9B
/* ZXHomePageFeedBackViewController.m in Sources */
,
A79C9D2F20DA3A7100D7D18E
/* CountingDownView.m in Sources */
,
A79C9D2F20DA3A7100D7D18E
/* CountingDownView.m in Sources */
,
...
@@ -5497,6 +5527,7 @@
...
@@ -5497,6 +5527,7 @@
A7DF4A452105856F00A81B7E
/* HMSegmentedControl.m in Sources */
,
A7DF4A452105856F00A81B7E
/* HMSegmentedControl.m in Sources */
,
22E36CAC1F558D9800073AC2
/* RefreshBarCodeModel.m in Sources */
,
22E36CAC1F558D9800073AC2
/* RefreshBarCodeModel.m in Sources */
,
A75436D621D34567005584CC
/* ZXChooseSchoolViewController.m in Sources */
,
A75436D621D34567005584CC
/* ZXChooseSchoolViewController.m in Sources */
,
1C8F4A642321EFF800AAF24A
/* ZXAdTool.m in Sources */
,
A754369F21D33217005584CC
/* H5UseCouponsView.m in Sources */
,
A754369F21D33217005584CC
/* H5UseCouponsView.m in Sources */
,
A7265BE320CA2AB60084B814
/* ZXPopMenuViewController.m in Sources */
,
A7265BE320CA2AB60084B814
/* ZXPopMenuViewController.m in Sources */
,
A73532012191893400880F45
/* ZXDrinkConfig.m in Sources */
,
A73532012191893400880F45
/* ZXDrinkConfig.m in Sources */
,
...
@@ -5505,6 +5536,7 @@
...
@@ -5505,6 +5536,7 @@
1C5B26BE225B3B8F001B0E1B
/* ZXUserSettingModel.m in Sources */
,
1C5B26BE225B3B8F001B0E1B
/* ZXUserSettingModel.m in Sources */
,
A7F3E1C721B5352900010E23
/* zip.c in Sources */
,
A7F3E1C721B5352900010E23
/* zip.c in Sources */
,
A7F3E02121B530F500010E23
/* ZXBookracketCell.m in Sources */
,
A7F3E02121B530F500010E23
/* ZXBookracketCell.m in Sources */
,
1C8F4A672322358000AAF24A
/* ZXUMStatisticsManager.m in Sources */
,
A7F3E13521B5330F00010E23
/* DALabeledCircularProgressView.m in Sources */
,
A7F3E13521B5330F00010E23
/* DALabeledCircularProgressView.m in Sources */
,
A7DECC972079F0E30039EC22
/* ZXGoodsMsgAlertViewController.m in Sources */
,
A7DECC972079F0E30039EC22
/* ZXGoodsMsgAlertViewController.m in Sources */
,
1CD9E52622890A1100FFDA29
/* ZXBluetoothModel.m in Sources */
,
1CD9E52622890A1100FFDA29
/* ZXBluetoothModel.m in Sources */
,
...
...
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/UserInterfaceState.xcuserstate
View file @
4f142d2e
No preview for this file type
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @
4f142d2e
...
@@ -16,20 +16,6 @@
...
@@ -16,20 +16,6 @@
<BreakpointProxy
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
<BreakpointContent
shouldBeEnabled =
"No"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"ColorfulSchool/Classes/Tool(工具)/ZXTool.m"
timestampString =
"589276473.6948169"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"1708"
endingLineNumber =
"1708"
>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"Yes"
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
continueAfterRunningActions =
"No"
...
@@ -75,53 +61,5 @@
...
@@ -75,53 +61,5 @@
landmarkType =
"7"
>
landmarkType =
"7"
>
</BreakpointContent>
</BreakpointContent>
</BreakpointProxy>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"../../../Desktop/ss/ss/View/DC_ZXWashOrderPayCell.m"
timestampString =
"589276473.695222"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"110"
endingLineNumber =
"110"
landmarkName =
"-setOrder:"
landmarkType =
"7"
>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"../../../Desktop/ss/ss/View/DC_ZXWashOrderPayCell.m"
timestampString =
"589276473.695297"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"94"
endingLineNumber =
"94"
landmarkName =
"-setOrder:"
landmarkType =
"7"
>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"../../../Desktop/ss/ss/View/DC_ZXWashOrderPayCell.m"
timestampString =
"589276473.695364"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"88"
endingLineNumber =
"88"
landmarkName =
"-setOrder:"
landmarkType =
"7"
>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Breakpoints>
</Bucket>
</Bucket>
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.h
View file @
4f142d2e
...
@@ -15,8 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
...
@@ -15,8 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
-
(
void
)
defaultLauchConfigAndIsOpenPreventCrashManager
:(
BOOL
)
open
;
-
(
void
)
defaultLauchConfigAndIsOpenPreventCrashManager
:(
BOOL
)
open
;
#pragma mark - ========== 开屏广告 ==========
-
(
void
)
loadLauchAd
;
@end
@end
...
...
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.m
View file @
4f142d2e
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#import <IQKeyboardManager/IQKeyboardManager.h>
#import <IQKeyboardManager/IQKeyboardManager.h>
#import <JJException/JJException.h>
#import <JJException/JJException.h>
#import "ZXLoginViewController.h"
#import "ZXLoginViewController.h"
@implementation
AppDelegate
(
Extension
)
@implementation
AppDelegate
(
Extension
)
#pragma mark - ========== 默认配置部分 ==========
#pragma mark - ========== 默认配置部分 ==========
-
(
void
)
defaultLauchConfigAndIsOpenPreventCrashManager
:(
BOOL
)
open
{
-
(
void
)
defaultLauchConfigAndIsOpenPreventCrashManager
:(
BOOL
)
open
{
...
@@ -29,14 +30,14 @@
...
@@ -29,14 +30,14 @@
[
UIScrollView
appearance
].
contentInsetAdjustmentBehavior
=
UIScrollViewContentInsetAdjustmentNever
;
[
UIScrollView
appearance
].
contentInsetAdjustmentBehavior
=
UIScrollViewContentInsetAdjustmentNever
;
}
}
[[
UIApplication
sharedApplication
]
setStatusBarStyle
:
UIStatusBarStyleLightContent
];
[[
UIApplication
sharedApplication
]
setStatusBarStyle
:
UIStatusBarStyleLightContent
];
//友盟统计
[
ZXUMStatisticsManager
configUMStatistics
];
//微信
//微信
[
WXApi
registerApp
:
@"1468685302"
];
[
WXApi
registerApp
:
@"1468685302"
];
//京东
//京东
[[
JDPAuthSDK
sharedJDPay
]
registServiceWithAppID
:
@"472e3b43e32aac8711df1c7586b89a2a"
merchantID
:
@"110979562002"
];
[[
JDPAuthSDK
sharedJDPay
]
registServiceWithAppID
:
@"472e3b43e32aac8711df1c7586b89a2a"
merchantID
:
@"110979562002"
];
//请求最新的是否需要曝光配置
//请求最新的是否需要曝光配置
[
ZXTool
requestIsNeedExposure
];
[
ZXTool
requestIsNeedExposure
];
//bugly
//bugly
[
Bugly
startWithAppId
:
@"d3a5bd8d35"
];
[
Bugly
startWithAppId
:
@"d3a5bd8d35"
];
//IQKeyboardManager
//IQKeyboardManager
...
@@ -61,28 +62,7 @@
...
@@ -61,28 +62,7 @@
//网络监测
//网络监测
[
self
checkNetworkingStatus
];
[
self
checkNetworkingStatus
];
}
}
-
(
void
)
loadLauchAd
{
//开屏广告
if
(
CacheUserId
&&
[[
kUserDefaults
objectForKey
:
kAPP_LauchAD
]
isEqualToString
:
@"yes"
])
{
[[
ZXTXAdTool
sharedZXTXAdTool
]
createLauchAdByPlacmentId
:
kTXAdLauchPLACEMENTID
];
}
//获取当前用户是否开启开屏
if
(
CacheUserId
)
{
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodGET
url
:[
NSString
stringWithFormat
:
@"%@/tencent/advertisement/spread?id=%@&sourceType=iOS"
,
[
kUserDefaults
valueForKey
:
@"SX_MONEY"
],
CacheUserId
]
para
:
nil
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
if
(
common
&&
[
common
.
data
[
@"whether"
]
integerValue
]
==
1
)
{
[
kUserDefaults
setObject
:
@"yes"
forKey
:
kAPP_LauchAD
];
if
(
common
.
data
[
@"millisecond"
]
&&
[
common
.
data
[
@"millisecond"
]
integerValue
])
{
[
kUserDefaults
setObject
:
common
.
data
[
@"millisecond"
]
forKey
:
kAPP_LauchADCloseTimeinterval
];
}
else
{
[
kUserDefaults
removeObjectForKey
:
kAPP_LauchADCloseTimeinterval
];
}
}
else
{
[
kUserDefaults
setObject
:
@"no"
forKey
:
kAPP_LauchAD
];
[
kUserDefaults
removeObjectForKey
:
kAPP_LauchADCloseTimeinterval
];
}
}];
}
}
#pragma mark - ========== 网络状态 ==========
#pragma mark - ========== 网络状态 ==========
-
(
void
)
checkNetworkingStatus
{
-
(
void
)
checkNetworkingStatus
{
...
...
ColorfulSchool/ColorfulSchool/AppDelegate.m
View file @
4f142d2e
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#import "UpdateVersionModel.h"
#import "UpdateVersionModel.h"
#import <SDWebImage/SDImageCache.h>
#import <SDWebImage/SDImageCache.h>
#import "YYFPSLabel.h"
#import "YYFPSLabel.h"
#import "ZXAdTool.h"
#define TIME_ANIMATION 1.0
#define TIME_ANIMATION 1.0
#define PERSPECTIVE -1.0 / 200.0
#define PERSPECTIVE -1.0 / 200.0
...
@@ -59,7 +60,6 @@
...
@@ -59,7 +60,6 @@
#pragma mark AppDelegate代理
#pragma mark AppDelegate代理
-
(
BOOL
)
application
:(
UIApplication
*
)
application
didFinishLaunchingWithOptions
:(
NSDictionary
*
)
launchOptions
{
-
(
BOOL
)
application
:(
UIApplication
*
)
application
didFinishLaunchingWithOptions
:(
NSDictionary
*
)
launchOptions
{
_isPlaying
=
NO
;
_isPlaying
=
NO
;
//启动环境
//启动环境
...
@@ -71,12 +71,12 @@
...
@@ -71,12 +71,12 @@
//设置根视图
//设置根视图
[
self
createWindow
];
[
self
createWindow
];
//开屏广告
[
self
loadLauchAd
];
//token登录
//token登录
[
self
tokenLogin
];
[
self
tokenLogin
];
//开屏广告
[
ZXAdTool
startLauchAd
];
//版本检测
//版本检测
[
self
checkVersion
];
[
self
checkVersion
];
...
@@ -86,6 +86,7 @@
...
@@ -86,6 +86,7 @@
//默认配置
//默认配置
[
self
defaultLauchConfigAndIsOpenPreventCrashManager
:
NO
];
[
self
defaultLauchConfigAndIsOpenPreventCrashManager
:
NO
];
//防止蓝牙洗浴后台运行被系统中断
//防止蓝牙洗浴后台运行被系统中断
NSTimer
*
timer
=
[
NSTimer
scheduledTimerWithTimeInterval
:
20
target
:
self
selector
:
@selector
(
ccc
)
userInfo
:
nil
repeats
:
YES
];
NSTimer
*
timer
=
[
NSTimer
scheduledTimerWithTimeInterval
:
20
target
:
self
selector
:
@selector
(
ccc
)
userInfo
:
nil
repeats
:
YES
];
[[
NSRunLoop
mainRunLoop
]
addTimer
:
timer
forMode
:
NSRunLoopCommonModes
];
[[
NSRunLoop
mainRunLoop
]
addTimer
:
timer
forMode
:
NSRunLoopCommonModes
];
...
...
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/TXADHeader.h
0 → 100644
View file @
4f142d2e
//
//
// TXADHeader.h
// ColorfulSchool
//
// Created by liuZX on 2019/1/4.
// Copyright © 2019年 Colorful Any Door. All rights reserved.
//
#ifndef TXADHeader_h
#define TXADHeader_h
#define kTXAdAPPID @"1108089964"
#define kTXAdNativePLACEMENTID @"8030751158735005" //原生广告id
#define kTXAdLauchPLACEMENTID @"9090758636743260" //开屏广告id
#define kTXAdBannerPLACEMENTID @"1090852550236628" //banner广告id
#endif
/* TXADHeader_h */
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.h
0 → 100644
View file @
4f142d2e
//
//
// ZXAdTool.h
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/9/6.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface
ZXAdTool
:
NSObject
+
(
void
)
startLauchAd
;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.m
0 → 100644
View file @
4f142d2e
//
//
// ZXAdTool.m
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/9/6.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "ZXAdTool.h"
#import "ZXLauchModel.h"
#import "ZXFullScreenAdView.h"
#import "ZXHomePageWebViewController.h"
#import <JDSDK/KeplerApiManager.h>
@implementation
ZXAdTool
+
(
void
)
startLauchAd
{
//开屏广告 二次展示
if
(
CacheUserId
==
nil
)
{
return
;
}
// ZXLauchModel *lastAd = [ZXLauchModel findAll].lastObject;
// if (lastAd && lastAd.whether) {
// if (lastAd.platformSource == 1) {
// ZXFullScreenAdView *adView = [[ZXFullScreenAdView alloc] initWithFrame:[UIScreen mainScreen].bounds];
// adView.duration = lastAd.millisecond / 1000;
// adView.waitTime = 3;
// adView.skipType = SkipButtonTypeNormalTimeAndText;
// @weakify(self);
// adView.adImageTapBlock = ^(NSString *content) {
// @strongify(self);
// //内部点击
// [self nativeAdClickByAdModel:lastAd];
// //点击逻辑
// [self jumpAction:lastAd];
//
// };
// [adView reloadAdImageWithUrl:lastAd.advertImg];
// [kAppWindow addSubview:adView];
//
// //内部曝光
// [self nativeAdExposeByAdModel:lastAd];
//
// } else {
// [[ZXTXAdTool sharedZXTXAdTool] createLauchAdByPlacmentId:kTXAdLauchPLACEMENTID];
// }
// }
// //获取当前用户是否开启开屏
// [ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/tencent/advertisement/spread2?id=%@&sourceType=iOS", [kUserDefaults valueForKey:@"SX_MONEY"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
// if (error == nil) {
// ZXLauchModel *lauch = [ZXLauchModel mj_objectWithKeyValues:common.data];
// [ZXLauchModel clearTable];
// [lauch save];
// }
// }];
//开屏广告 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
)
{
if
(
error
==
nil
)
{
ZXLauchModel
*
lauch
=
[
ZXLauchModel
mj_objectWithKeyValues
:
common
.
data
];
[
ZXLauchModel
clearTable
];
[
lauch
save
];
if
(
lauch
.
whether
==
NO
)
{
return
;
}
dispatch_async
(
dispatch_get_main_queue
(),
^
{
if
(
lauch
.
isButt
)
{
[[
ZXTXAdTool
sharedZXTXAdTool
]
createLauchAdByPlacmentId
:
kTXAdLauchPLACEMENTID
];
}
else
{
ZXFullScreenAdView
*
adView
=
[[
ZXFullScreenAdView
alloc
]
initWithFrame
:[
UIScreen
mainScreen
].
bounds
];
adView
.
duration
=
lauch
.
millisecond
/
1000
;
adView
.
waitTime
=
3
;
adView
.
skipType
=
SkipButtonTypeNormalTimeAndText
;
@weakify
(
self
);
adView
.
adImageTapBlock
=
^
(
NSString
*
content
)
{
@strongify
(
self
);
//内部点击
[
self
nativeAdClickByAdModel
:
lauch
];
//点击逻辑
[
self
jumpAction
:
lauch
];
};
[
adView
reloadAdImageWithUrl
:
lauch
.
advertImg
];
[
kAppWindow
addSubview
:
adView
];
//内部曝光
[
self
nativeAdExposeByAdModel
:
lauch
];
}
});
}
}];
}
#pragma mark - 广告的曝光
/*
* model 广告模型
*/
+
(
void
)
nativeAdExposeByAdModel
:
(
ZXLauchModel
*
)
model
{
dispatch_async
(
dispatch_get_global_queue
(
0
,
0
),
^
{
[
ZXUMStatisticsManager
statisticsLauchAdExposeByAdId
:
model
.
zx_id
source
:
model
.
platformSource
];
//外部曝光
if
([
model
.
showAddressIos
containsString
:
@"http"
])
{
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodGET
url
:[
ZXTool
formatJumpUrl
:
model
.
showAddressIos
]
para
:
nil
completed
:
nil
];
}
if
([[
kUserDefaults
valueForKey
:
@"isNeedExposure"
]
isEqualToString
:
@"1"
])
{
return
;
}
if
(
model
.
showAddressIos
==
nil
||
[
model
.
showAddressIos
isEqualToString
:
@""
]
||
!
[
model
.
showAddressIos
containsString
:
@"http:"
]
||
!
[
model
.
showAddressIos
containsString
:
@"https:"
])
{
return
;
}
NSDictionary
*
dic
=
@{
@"adsenseName"
:
model
.
advertTitle
.
length
>
30
?[
model
.
advertTitle
substringToIndex
:
29
]:
model
.
advertTitle
,
@"advertType"
:
@"曝光"
,
@"advertTitle"
:
model
.
advertTitle
.
length
>
30
?[
model
.
advertTitle
substringToIndex
:
29
]:
model
.
advertTitle
,
@"advertImg"
:
model
.
advertImg
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
@
(
model
.
zx_id
),
@"platformCode"
:
@"DCXY_iOS"
};
//内部曝光
NSString
*
url
=
[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,[
kUserDefaults
valueForKey
:
@"Ad"
]];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:
url
para
:
dic
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
});
}
#pragma mark - 广告的点击
/*
* model 广告模型
*/
+
(
void
)
nativeAdClickByAdModel
:
(
ZXLauchModel
*
)
model
{
dispatch_async
(
dispatch_get_global_queue
(
0
,
0
),
^
{
//友盟统计
[
ZXUMStatisticsManager
statisticsLauchAdClickByAdId
:
model
.
zx_id
source
:
model
.
platformSource
];
//内部点击
NSDictionary
*
dic
=
@{
@"adsenseName"
:
model
.
advertTitle
.
length
>
30
?[
model
.
advertTitle
substringToIndex
:
29
]:
model
.
advertTitle
,
@"advertType"
:
@"点击"
,
@"advertTitle"
:
model
.
advertTitle
.
length
>
30
?[
model
.
advertTitle
substringToIndex
:
29
]:
model
.
advertTitle
,
@"advertImg"
:
model
.
advertImg
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
@
(
model
.
zx_id
),
@"platformCode"
:
@"DCXY_iOS"
};
NSString
*
url
=
[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,[
kUserDefaults
valueForKey
:
@"Ad"
]];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:
url
para
:
dic
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
});
}
#pragma mark - 点击跳转逻辑
+
(
void
)
jumpAction
:
(
ZXLauchModel
*
)
lastAd
{
if
(
lastAd
.
jumpType
==
nil
)
{
return
;
}
switch
([
lastAd
.
jumpType
integerValue
])
{
case
1
:
{
//1无
break
;
}
case
2
:
{
//2自编内容
if
(
lastAd
.
zx_id
==
0
)
{
return
;
}
//跳转H5页面 渲染富文本
ZXHomePageWebViewController
*
attVc
=
[[
ZXHomePageWebViewController
alloc
]
init
];
attVc
.
itemCode
=
[
NSString
stringWithFormat
:
@"%ld"
,
lastAd
.
zx_id
];
[[
ZXTool
getCurrentVC
]
presentViewController
:
attVc
animated
:
YES
completion
:
nil
];
break
;
}
case
3
:
{
//3内部跳转
if
(
lastAd
.
iosButtAddress
==
nil
||
[
lastAd
.
iosButtAddress
isEqualToString
:
@""
])
{
return
;
}
ZXHomePageWebViewController
*
bannerVc
=
[[
ZXHomePageWebViewController
alloc
]
init
];
bannerVc
.
jumpUrl
=
lastAd
.
iosButtAddress
;
[[
ZXTool
getCurrentVC
]
presentViewController
:
bannerVc
animated
:
YES
completion
:
nil
];
break
;
}
case
4
:
{
//4外部跳转
if
(
lastAd
.
iosButtAddress
==
nil
||
[
lastAd
.
iosButtAddress
isEqualToString
:
@""
])
{
return
;
}
if
([[
UIApplication
sharedApplication
]
canOpenURL
:[
NSURL
URLWithString
:
lastAd
.
iosButtAddress
]])
{
[[
UIApplication
sharedApplication
]
openURL
:[
NSURL
URLWithString
:
lastAd
.
iosButtAddress
]];
}
break
;
}
case
5
:
{
//5呼起第三方
if
(
lastAd
.
iosButtAddress
==
nil
||
[
lastAd
.
iosButtAddress
isEqualToString
:
@""
])
{
return
;
}
if
(
lastAd
.
platformSource
==
6
)
{
//京东
NSString
*
url
;
if
([
lastAd
.
iosButtAddress
containsString
:
@"?"
])
{
url
=
[
lastAd
.
iosButtAddress
stringByAppendingString
:
@"isopen=1&ad_od=1&allowJDApp=1"
];
}
else
{
url
=
[
lastAd
.
iosButtAddress
stringByAppendingString
:
@"?isopen=1&ad_od=1&allowJDApp=1"
];
}
[[
KeplerApiManager
sharedKPService
]
openKeplerPageWithURL
:
url
userInfo
:
nil
failedCallback
:^
(
NSInteger
code
,
NSString
*
url
)
{
if
(
code
==
422
)
{
//跳转webview打开
ZXHomePageWebViewController
*
bannerVc
=
[[
ZXHomePageWebViewController
alloc
]
init
];
bannerVc
.
jumpUrl
=
url
;
[[
ZXTool
getCurrentVC
]
presentViewController
:
bannerVc
animated
:
YES
completion
:
nil
];
}
}];
}
else
{
if
([[
UIApplication
sharedApplication
]
canOpenURL
:[
NSURL
URLWithString
:
lastAd
.
iosButtAddress
]])
{
[[
UIApplication
sharedApplication
]
openURL
:[
NSURL
URLWithString
:
lastAd
.
iosButtAddress
]];
}
}
break
;
}
default
:
break
;
}
}
@end
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXFullScreenAdView.h
0 → 100755
View file @
4f142d2e
//
//
// ZXFullScreenAdView.h
// ZXFullScreenAdView
//
// Created by 刘卓鑫 on 2019/9/5.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
typedef
NS_ENUM
(
NSUInteger
,
SkipButtonType
)
{
SkipButtonTypeNormalTimeAndText
=
0
,
//普通的倒计时+跳过
SkipButtonTypeCircleAnimationTest
,
//圆形动画+跳过
SkipButtonTypeNormalText
,
//只有普通的跳过
SkipButtonTypeNormalTime
,
//只有普通的倒计时
SkipButtonTypeNone
//无
};
typedef
void
(
^
adImageBlock
)(
NSString
*
content
);
//可以根据需要添加一些相应的参数
@interface
ZXFullScreenAdView
:
UIImageView
/** 广告图的显示时间(默认5秒)*/
@property
(
nonatomic
,
assign
)
NSUInteger
duration
;
/** 获取数据前,启动图的等待时间(若不设置则不启动等待机制)*/
@property
(
nonatomic
,
assign
)
NSUInteger
waitTime
;
/** 右上角按钮的样式(默认倒计时+跳过)*/
@property
(
nonatomic
,
assign
)
SkipButtonType
skipType
;
/** 广告图点击事件回调*/
@property
(
nonatomic
,
copy
)
adImageBlock
adImageTapBlock
;
/** 加载广告图*/
-
(
void
)
reloadAdImageWithUrl
:(
NSString
*
)
urlStr
;
@end
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXFullScreenAdView.m
0 → 100755
View file @
4f142d2e
//
//
// ZXFullScreenAdView.m
// ZXFullScreenAdView
//
// Created by 刘卓鑫 on 2019/9/5.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "ZXFullScreenAdView.h"
#import "SDWebImageManager.h"
#define MainScreenWidth [UIScreen mainScreen].bounds.size.width
@interface
ZXFullScreenAdView
()
@property
(
nonatomic
,
strong
)
UIButton
*
skipButton
;
//跳过按钮
@property
(
nonatomic
,
strong
)
dispatch_source_t
timer
;
//显示计时器
@property
(
nonatomic
,
strong
)
dispatch_source_t
timerWait
;
//等待计时器
@property
(
nonatomic
,
assign
)
BOOL
flag
;
//是否将要消失
@property
(
nonatomic
,
strong
)
UIView
*
timerView
;
@property
(
nonatomic
,
weak
)
CAShapeLayer
*
viewLayer
;
@property
(
nonatomic
,
assign
)
NSInteger
remain
;
//剩余时间
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@end
@implementation
ZXFullScreenAdView
-
(
instancetype
)
init
{
if
(
self
=
[
super
init
])
{
[
self
configDefaultParameter
];
}
return
self
;
}
-
(
UIButton
*
)
skipButton
{
if
(
!
_skipButton
)
{
_skipButton
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
_skipButton
.
frame
=
CGRectMake
(
MainScreenWidth
-
70
,
30
,
60
,
30
);
_skipButton
.
backgroundColor
=
[
UIColor
colorWithRed
:
0
green
:
0
blue
:
0
alpha
:
0
.
4
];
_skipButton
.
layer
.
cornerRadius
=
15
;
_skipButton
.
layer
.
masksToBounds
=
YES
;
_skipButton
.
titleLabel
.
font
=
[
UIFont
systemFontOfSize
:
13
.
5
];
__weak
ZXFullScreenAdView
*
weakSelf
=
self
;
[
_skipButton
addTarget
:
weakSelf
action
:
@selector
(
skipAction
)
forControlEvents
:
UIControlEventTouchUpInside
];
}
return
_skipButton
;
}
-
(
void
)
setDuration
:
(
NSUInteger
)
duration
{
_duration
=
duration
;
if
(
duration
<
3
)
{
_duration
=
3
;
}
}
-
(
void
)
setWaitTime
:
(
NSUInteger
)
waitTime
{
_waitTime
=
waitTime
;
if
(
waitTime
<
1
)
{
_waitTime
=
1
;
}
[
self
scheduledWaitTimer
];
// 启动等待计时器
}
-
(
UIView
*
)
timerView
{
if
(
!
_timerView
)
{
self
.
timerView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
MainScreenWidth
-
62
,
32
,
40
,
40
)];
CAShapeLayer
*
layer
=
[
CAShapeLayer
layer
];
layer
.
fillColor
=
[
UIColor
colorWithRed
:
0
green
:
0
blue
:
0
alpha
:
0
.
4
].
CGColor
;
// 填充颜色
layer
.
strokeColor
=
[
UIColor
redColor
].
CGColor
;
// 绘制颜色
layer
.
lineCap
=
kCALineCapRound
;
layer
.
lineJoin
=
kCALineJoinRound
;
layer
.
lineWidth
=
2
;
layer
.
frame
=
self
.
bounds
;
layer
.
path
=
[
self
getCirclePath
].
CGPath
;
layer
.
strokeStart
=
0
;
[
_timerView
.
layer
addSublayer
:
layer
];
self
.
viewLayer
=
layer
;
UILabel
*
titleLabel
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
3
,
3
,
34
,
34
)];
titleLabel
.
text
=
@"跳过"
;
titleLabel
.
textColor
=
[
UIColor
whiteColor
];
[
titleLabel
setTextAlignment
:
NSTextAlignmentCenter
];
titleLabel
.
font
=
[
UIFont
systemFontOfSize
:
15
];
[
_timerView
addSubview
:
titleLabel
];
_remain
=
_duration
*
20
;
_count
=
0
;
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
skipAction
)];
[
_timerView
addGestureRecognizer
:
tap
];
}
return
_timerView
;
}
#pragma mark - Private Method -
/** 配置默认参数 */
-
(
void
)
configDefaultParameter
{
self
.
flag
=
NO
;
self
.
duration
=
5
;
self
.
skipType
=
SkipButtonTypeNormalTimeAndText
;
self
.
image
=
[
self
getLaunchImage
];
self
.
frame
=
[[
UIScreen
mainScreen
]
bounds
];
}
/** 获取启动图片 */
-
(
UIImage
*
)
getLaunchImage
{
CGSize
viewSize
=
[
UIScreen
mainScreen
].
bounds
.
size
;
NSString
*
viewOrientation
=
@"Portrait"
;
// 横屏请设置成 @"Landscape"
UIImage
*
lauchImage
=
nil
;
NSArray
*
imagesDictionary
=
[[[
NSBundle
mainBundle
]
infoDictionary
]
valueForKey
:
@"UILaunchImages"
];
for
(
NSDictionary
*
dict
in
imagesDictionary
)
{
CGSize
imageSize
=
CGSizeFromString
(
dict
[
@"UILaunchImageSize"
]);
if
(
CGSizeEqualToSize
(
imageSize
,
viewSize
)
&&
[
viewOrientation
isEqualToString
:
dict
[
@"UILaunchImageOrientation"
]])
{
lauchImage
=
[
UIImage
imageNamed
:
dict
[
@"UILaunchImageName"
]];
}
}
return
lauchImage
;
}
/* 绘制路径
* path这个属性必须需要设置,不然是没有效果的/
*/
-
(
UIBezierPath
*
)
getCirclePath
{
return
[
UIBezierPath
bezierPathWithArcCenter
:
CGPointMake
(
20
,
20
)
radius
:
19
startAngle
:-
0
.
5
*
M_PI
endAngle
:
1
.
5
*
M_PI
clockwise
:
YES
];
}
#pragma mark - Public Method -
/** 获取广告图 */
-
(
void
)
reloadAdImageWithUrl
:
(
NSString
*
)
urlStr
{
if
(
urlStr
.
length
<=
0
)
{
if
(
_timerWait
)
dispatch_source_cancel
(
_timerWait
);
[
self
removeFromSuperview
];
return
;
}
NSURL
*
imageUrl
=
[
NSURL
URLWithString
:
urlStr
];
__weak
typeof
(
self
)
weakSelf
=
self
;
UIImage
*
cacheImage
=
[[
SDImageCache
sharedImageCache
]
imageFromDiskCacheForKey
:
urlStr
];
if
(
cacheImage
)
{
NSLog
(
@"cacheImage"
);
[
weakSelf
adImageShowWithImage
:
cacheImage
];
}
else
{
NSLog
(
@"noCacheImage"
);
SDWebImageManager
*
manager
=
[
SDWebImageManager
sharedManager
];
[
manager
downloadImageWithURL
:
imageUrl
options
:
SDWebImageLowPriority
progress
:^
(
NSInteger
receivedSize
,
NSInteger
expectedSize
)
{
}
completed
:^
(
UIImage
*
image
,
NSError
*
error
,
SDImageCacheType
cacheType
,
BOOL
finished
,
NSURL
*
imageURL
)
{
if
(
image
&&
finished
&&
error
==
nil
)
{
[
weakSelf
adImageShowWithImage
:
image
];
[[
SDImageCache
sharedImageCache
]
storeImage
:
image
forKey
:
urlStr
toDisk
:
YES
];
}
}];
}
}
/** 显示广告图 */
-
(
void
)
adImageShowWithImage
:
(
UIImage
*
)
image
{
if
(
_flag
)
return
;
if
(
_timerWait
)
dispatch_source_cancel
(
_timerWait
);
self
.
image
=
image
;
self
.
userInteractionEnabled
=
YES
;
if
(
_skipType
==
SkipButtonTypeCircleAnimationTest
)
{
[
self
addSubview
:
self
.
timerView
];
[
self
setCircleTimer
];
}
else
{
[
self
addSubview
:
self
.
skipButton
];
[
self
scheduledTimer
];
}
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
tapAction
)];
[
self
addGestureRecognizer
:
tap
];
CATransition
*
animation
=
[
CATransition
animation
];
animation
.
duration
=
0
.
2
;
//动画执行时间
animation
.
timingFunction
=
UIViewAnimationCurveEaseInOut
;
animation
.
type
=
kCATransitionFade
;
[
self
.
layer
addAnimation
:
animation
forKey
:
@"animation"
];
}
/** 广告图显示倒计时 */
-
(
void
)
setCircleTimer
{
dispatch_queue_t
queue
=
dispatch_get_global_queue
(
DISPATCH_QUEUE_PRIORITY_DEFAULT
,
0
);
_timer
=
dispatch_source_create
(
DISPATCH_SOURCE_TYPE_TIMER
,
0
,
0
,
queue
);
dispatch_source_set_timer
(
_timer
,
dispatch_walltime
(
NULL
,
0
),
0
.
05
*
NSEC_PER_SEC
,
0
);
// 每秒执行
dispatch_source_set_event_handler
(
_timer
,
^
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
if
(
self
->
_count
>=
self
->
_remain
)
{
dispatch_source_cancel
(
self
->
_timer
);
self
.
viewLayer
.
strokeStart
=
1
;
[
self
dismiss
];
// 关闭界面
}
else
{
self
.
viewLayer
.
strokeStart
+=
0
.
01
;
self
->
_count
++
;
//剩余时间进行自加
}
});
});
dispatch_resume
(
_timer
);
}
/** 广告图显示倒计时 */
-
(
void
)
scheduledTimer
{
if
(
_timerWait
)
dispatch_source_cancel
(
_timerWait
);
dispatch_queue_t
queue
=
dispatch_get_global_queue
(
DISPATCH_QUEUE_PRIORITY_DEFAULT
,
0
);
_timer
=
dispatch_source_create
(
DISPATCH_SOURCE_TYPE_TIMER
,
0
,
0
,
queue
);
dispatch_source_set_timer
(
_timer
,
dispatch_walltime
(
NULL
,
0
),
1
.
0
*
NSEC_PER_SEC
,
0
);
// 每秒执行
dispatch_source_set_event_handler
(
_timer
,
^
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
if
(
self
->
_duration
<=
0
)
{
dispatch_source_cancel
(
self
->
_timer
);
[
self
dismiss
];
// 关闭界面
}
else
{
[
self
showSkipBtnTitleTime
:
self
->
_duration
];
self
->
_duration
--
;
}
});
});
dispatch_resume
(
_timer
);
}
/** 广告图加载前等待计时器 */
-
(
void
)
scheduledWaitTimer
{
if
(
_timerWait
)
dispatch_source_cancel
(
_timerWait
);
dispatch_queue_t
queue
=
dispatch_get_global_queue
(
DISPATCH_QUEUE_PRIORITY_DEFAULT
,
0
);
_timerWait
=
dispatch_source_create
(
DISPATCH_SOURCE_TYPE_TIMER
,
0
,
0
,
queue
);
dispatch_source_set_timer
(
_timerWait
,
dispatch_walltime
(
NULL
,
0
),
1
.
0
*
NSEC_PER_SEC
,
0
);
dispatch_source_set_event_handler
(
_timerWait
,
^
{
if
(
self
->
_waitTime
<=
0
)
{
self
->
_flag
=
YES
;
dispatch_source_cancel
(
self
->
_timerWait
);
dispatch_async
(
dispatch_get_main_queue
(),
^
{
[
self
dismiss
];
// 关闭界面
});
}
else
{
self
->
_waitTime
--
;
}
});
dispatch_resume
(
_timerWait
);
}
/** 消失广告图 */
-
(
void
)
dismiss
{
NSLog
(
@"dismiss"
);
[
UIView
animateWithDuration
:
0
.
5
delay
:
0
.
3
options
:
UIViewAnimationOptionCurveEaseOut
animations
:^
{
self
.
transform
=
CGAffineTransformMakeScale
(
1
.
2
,
1
.
2
);
self
.
alpha
=
0
.
0
;
}
completion
:^
(
BOOL
finished
)
{
[
self
removeFromSuperview
];
}];
}
/** 设置跳过按钮 */
-
(
void
)
showSkipBtnTitleTime
:
(
NSInteger
)
timeLeave
{
switch
(
_skipType
)
{
case
SkipButtonTypeNormalTimeAndText
:
[
self
.
skipButton
setTitle
:[
NSString
stringWithFormat
:
@"跳过 %ld"
,
(
long
)
timeLeave
]
forState
:
UIControlStateNormal
];
break
;
case
SkipButtonTypeNormalText
:
[
self
.
skipButton
setTitle
:
@"跳过"
forState
:
UIControlStateNormal
];
break
;
case
SkipButtonTypeNormalTime
:
[
self
.
skipButton
setTitle
:[
NSString
stringWithFormat
:
@"%ld S"
,
(
long
)
timeLeave
]
forState
:
UIControlStateNormal
];
break
;
case
SkipButtonTypeNone
:
self
.
skipButton
.
hidden
=
YES
;
break
;
default
:
break
;
}
}
#pragma mark - Action Method -
/** 广告图点击相应方法 */
-
(
void
)
tapAction
{
if
(
_timer
)
dispatch_source_cancel
(
_timer
);
[
self
dismiss
];
self
.
adImageTapBlock
(
@"广告图点击事件"
);
}
/** 跳过按钮响应方法 */
-
(
void
)
skipAction
{
if
(
_timer
)
dispatch_source_cancel
(
_timer
);
[
self
dismiss
];
}
-
(
void
)
dealloc
{
NSLog
(
@"销毁"
);
}
@end
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXLauchModel.h
0 → 100644
View file @
4f142d2e
//
//
// ZXLauchModel.h
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/9/5.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "JKDBModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface
ZXLauchModel
:
JKDBModel
/** 开屏广告id */
@property
(
nonatomic
,
assign
)
NSInteger
zx_id
;
/** 是否对接 */
@property
(
nonatomic
,
assign
)
NSInteger
isButt
;
/** "平台来源 1腾讯 2百度 3瑞狮 4友盟" */
@property
(
nonatomic
,
assign
)
NSInteger
platformSource
;
/** 广告标题 */
@property
(
nonatomic
,
copy
)
NSString
*
advertTitle
;
/** 显示时间 单位秒 */
@property
(
nonatomic
,
assign
)
NSInteger
showTime
;
/** 集成方式 1SDK 2地址 */
@property
(
nonatomic
,
copy
)
NSString
*
integrationWay
;
/** IOS对接地址 */
@property
(
nonatomic
,
copy
)
NSString
*
iosButtAddress
;
/** 安卓对接地址 */
@property
(
nonatomic
,
copy
)
NSString
*
androidButtAddress
;
/** 跳转类型 1无 2自编内容 3内部跳转 4外部跳转 5呼起第三方 */
@property
(
nonatomic
,
copy
)
NSString
*
jumpType
;
/** 开屏图片 */
@property
(
nonatomic
,
copy
)
NSString
*
advertImg
;
/** ios曝光地址 */
@property
(
nonatomic
,
copy
)
NSString
*
showAddressIos
;
/** android曝光地址 */
@property
(
nonatomic
,
copy
)
NSString
*
showAddressAndroid
;
/** 状态 1未发布 2已发布 */
@property
(
nonatomic
,
copy
)
NSString
*
state
;
/** 其它参数 json存储 */
@property
(
nonatomic
,
copy
)
NSString
*
otherParameter
;
/** 操作人 */
@property
(
nonatomic
,
copy
)
NSString
*
zx_operator
;
/** 创建时间 */
@property
(
nonatomic
,
copy
)
NSString
*
createAt
;
/** */
@property
(
nonatomic
,
copy
)
NSString
*
updateAt
;
/** */
@property
(
nonatomic
,
assign
)
BOOL
whether
;
/** */
@property
(
nonatomic
,
assign
)
NSInteger
millisecond
;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXLauchModel.m
0 → 100644
View file @
4f142d2e
//
//
// ZXLauchModel.m
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/9/5.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "ZXLauchModel.h"
@implementation
ZXLauchModel
+
(
NSDictionary
*
)
mj_replacedKeyFromPropertyName
{
return
@{
@"zx_id"
:
@"id"
};
}
@end
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXTXAdTool.h
0 → 100644
View file @
4f142d2e
//
//
// ZXTXAdTool.h
// ColorfulSchool
//
// Created by liuZX on 2019/1/4.
// Copyright © 2019年 Colorful Any Door. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <GDTMobSDK/GDTSDKDefines.h>
#import <GDTMobSDK/GDTSDKConfig.h>
#import <GDTMobSDK/GDTNativeAd.h>
#import <GDTMobSDK/GDTSplashAd.h>
#import <GDTMobSDK/GDTMobBannerView.h>
#import <GDTMobSDK/GDTMobInterstitial.h>
#import <GDTMobSDK/GDTNativeExpressAd.h>
#import <GDTMobSDK/GDTNativeExpressAdView.h>
NS_ASSUME_NONNULL_BEGIN
@interface
ZXTXAdTool
:
NSObject
//单例化
kSINGLETON_FOR_HEADER
(
ZXTXAdTool
)
/*开屏广告**/
-
(
void
)
createLauchAdByPlacmentId
:
(
NSString
*
)
placenmentId
;
/**原生广告 */
-
(
void
)
createNativieAdByView
:(
UIView
*
)
view
topView
:
(
UIView
*
)
topView
viewController
:
(
UIViewController
*
)
viewController
isFirstPage
:
(
BOOL
)
isFirstPage
isHasBottomMargin
:
(
BOOL
)
isHasBottomMargin
;
/**banner广告*/
-
(
void
)
createBannerAdByPlacmentId
:(
NSString
*
)
placenmentId
currentViewController
:
(
UIViewController
*
)
viewController
superView
:
(
UIView
*
)
superView
;
@property
(
nonatomic
,
copy
)
dispatch_block_t
closeAction
;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXTXAdTool.m
0 → 100644
View file @
4f142d2e
//
//
// ZXTXAdTool.m
// ColorfulSchool
//
// Created by liuZX on 2019/1/4.
// Copyright © 2019年 Colorful Any Door. All rights reserved.
//
#import "ZXTXAdTool.h"
#import <GDTSDKDefines.h>
@interface
ZXTXAdTool
()
<
GDTSplashAdDelegate
,
GDTNativeExpressAdDelegete
,
GDTMobBannerViewDelegate
>
//开屏广告
@property
(
strong
,
nonatomic
)
GDTSplashAd
*
splash
;
//原生广告
@property
(
nonatomic
,
strong
)
GDTNativeExpressAd
*
nativeAd
;
//原生广告内容
@property
(
nonatomic
,
strong
)
GDTNativeAdData
*
currentAdData
;
//banner广告
@property
(
nonatomic
,
strong
)
GDTMobBannerView
*
bannerView
;
@property
(
nonatomic
,
weak
)
UIView
*
adView
;
@property
(
nonatomic
,
weak
)
UIView
*
topView
;
@property
(
nonatomic
,
weak
)
UIViewController
*
fromVc
;
@property
(
nonatomic
,
assign
)
BOOL
isFristPage
;
//是否是首页
@property
(
nonatomic
,
assign
)
BOOL
isHasBottomMargin
;
//是否有底部间距
@property
(
nonatomic
,
strong
)
dispatch_source_t
gcdTimer
;
@property
(
nonatomic
,
strong
)
UIView
*
window
;
@end
@implementation
ZXTXAdTool
kSINGLETON_FOR_CLASS
(
ZXTXAdTool
)
#pragma mark - ========== 开屏广告 ==========
-
(
void
)
createLauchAdByPlacmentId
:
(
NSString
*
)
placenmentId
{
GDTSplashAd
*
splash
=
[[
GDTSplashAd
alloc
]
initWithAppId
:
kTXAdAPPID
placementId
:
placenmentId
];
splash
.
delegate
=
self
;
splash
.
fetchDelay
=
3
;
[
splash
loadAdAndShowInWindow
:
kAppWindow
];
// UIImageView *v1 = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 53 * k6Scale)];
// v1.image = [UIImage imageNamed:@"default_down"];
// [splash loadAdAndShowInWindow:kAppWindow withBottomView:v1];
self
.
splash
=
splash
;
}
-
(
void
)
splashAdApplicationWillEnterBackground
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
splashAdSuccessPresentScreen
:
(
GDTSplashAd
*
)
splashAd
{
if
([
kUserDefaults
valueForKey
:
kAPP_LauchADCloseTimeinterval
]
&&
([[
kUserDefaults
valueForKey
:
kAPP_LauchADCloseTimeinterval
]
integerValue
]
!=
0
))
{
NSInteger
times
=
[[
kUserDefaults
valueForKey
:
kAPP_LauchADCloseTimeinterval
]
integerValue
]
/
1000
;
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
times
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
UIViewController
*
vc
=
[
splashAd
valueForKey
:
@"splashViewController"
];
[
vc
dismissViewControllerAnimated
:
NO
completion
:
nil
];
});
}
NSLog
(
@"%s"
,
__FUNCTION__
);
if
(
CacheUserId
==
nil
)
{
return
;
}
@try
{
//曝光
id
x
=
[
splashAd
valueForKey
:
@"adModel"
];
NSString
*
imageUrl
=
[
x
valueForKey
:
@"imgUrl"
];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,
[
kUserDefaults
valueForKey
:
@"Ad"
]]
para
:
@{
@"adsenseName"
:
@"开屏广告"
,
@"advertType"
:
@"曝光"
,
@"advertTitle"
:
@"开屏广告"
,
@"advertImg"
:
imageUrl
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
kTXAdLauchPLACEMENTID
,
@"platformCode"
:
@"TXAD_iOS"
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
-
(
void
)
splashAdFailToPresent
:
(
GDTSplashAd
*
)
splashAd
withError
:
(
NSError
*
)
error
{
NSLog
(
@"%s%@"
,
__FUNCTION__
,
error
);
self
.
splash
=
nil
;
}
-
(
void
)
splashAdWillClosed
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
splashAdClosed
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
self
.
splash
=
nil
;
}
-
(
void
)
splashAdWillPresentFullScreenModal
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
splashAdDidPresentFullScreenModal
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
splashAdExposured
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
splashAdClicked
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
if
(
CacheUserId
==
nil
)
{
return
;
}
@try
{
//点击
id
x
=
[
splashAd
valueForKey
:
@"adModel"
];
NSString
*
imageUrl
=
[
x
valueForKey
:
@"imgUrl"
];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,
[
kUserDefaults
valueForKey
:
@"Ad"
]]
para
:
@{
@"adsenseName"
:
@"开屏广告"
,
@"advertType"
:
@"点击"
,
@"advertTitle"
:
@"开屏广告"
,
@"advertImg"
:
imageUrl
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
kTXAdLauchPLACEMENTID
,
@"platformCode"
:
@"TXAD_iOS"
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
-
(
void
)
splashAdWillDismissFullScreenModal
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
splashAdDidDismissFullScreenModal
:
(
GDTSplashAd
*
)
splashAd
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
#pragma mark - ========== 原生广告 ==========
-
(
void
)
createNativieAdByView
:
(
UIView
*
)
view
topView
:
(
UIView
*
)
topView
viewController
:
(
UIViewController
*
)
viewController
isFirstPage
:
(
BOOL
)
isFirstPage
isHasBottomMargin
:
(
BOOL
)
isHasBottomMargin
{
if
([[
UIDevice
currentDevice
]
userInterfaceIdiom
]
==
UIUserInterfaceIdiomPhone
)
{
if
(
self
.
gcdTimer
)
{
return
;
}
@try
{
self
.
nativeAd
=
[[
GDTNativeExpressAd
alloc
]
initWithAppId
:
kTXAdAPPID
placementId
:
kTXAdNativePLACEMENTID
adSize
:
CGSizeMake
(
kScreenWidth
,
kScreenWidth
*
0
.
56
)];
self
.
nativeAd
.
delegate
=
self
;
self
.
adView
=
view
;
self
.
topView
=
topView
;
self
.
isHasBottomMargin
=
isHasBottomMargin
;
self
.
isFristPage
=
isFirstPage
;
self
.
fromVc
=
viewController
;
[
self
.
nativeAd
loadAd
:
1
];
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
}
/**
* 拉取原生模板广告成功
*/
-
(
void
)
nativeExpressAdSuccessToLoad
:
(
GDTNativeExpressAd
*
)
nativeExpressAd
views
:
(
NSArray
<
__kindof
GDTNativeExpressAdView
*>
*
)
views
{
@try
{
GDTNativeExpressAdView
*
expressView
=
(
GDTNativeExpressAdView
*
)
views
.
lastObject
;
expressView
.
controller
=
self
.
fromVc
;
[
expressView
render
];
[
self
.
adView
addSubview
:
expressView
];
if
(
self
.
isFristPage
)
{
[
expressView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
equalTo
(
self
.
adView
.
mas_left
).
offset
(
5
*
k6Scale
);
make
.
right
.
equalTo
(
self
.
adView
.
mas_right
).
offset
(
-
5
*
k6Scale
);
make
.
height
.
mas_equalTo
(
kScreenWidth
*
0
.
56
);
make
.
bottom
.
equalTo
([
ZXPayManager
sharedZXPayManager
].
notPayOrderView
.
mas_top
);
}];
}
else
{
if
(
self
.
isHasBottomMargin
)
{
CGFloat
margin
=
49
;
if
(
iPhoneX
)
{
margin
=
83
;
}
[
expressView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
equalTo
(
self
.
adView
.
mas_left
).
offset
(
5
*
k6Scale
);
make
.
right
.
equalTo
(
self
.
adView
.
mas_right
).
offset
(
-
5
*
k6Scale
);
make
.
height
.
mas_equalTo
(
kScreenWidth
*
0
.
56
);
make
.
bottom
.
equalTo
(
self
.
adView
.
mas_bottom
).
offset
(
-
margin
);
}];
}
else
{
if
(
self
.
topView
)
{
[
expressView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
equalTo
(
self
.
adView
.
mas_left
).
offset
(
5
*
k6Scale
);
make
.
right
.
equalTo
(
self
.
adView
.
mas_right
).
offset
(
-
5
*
k6Scale
);
make
.
height
.
mas_equalTo
(
kScreenWidth
*
0
.
56
);
make
.
top
.
equalTo
(
self
.
topView
.
mas_bottom
).
offset
(
5
*
k6Scale
);
}];
}
else
{
[
expressView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
equalTo
(
self
.
adView
).
offset
(
15
*
k6Scale
);
make
.
right
.
equalTo
(
self
.
adView
).
offset
(
-
15
*
k6Scale
);
make
.
height
.
mas_equalTo
((
kScreenWidth
-
20
)
*
0
.
56
);
make
.
bottom
.
equalTo
(
self
.
adView
);
}];
}
}
}
if
(
self
.
isFristPage
==
NO
&&
self
.
isHasBottomMargin
==
NO
&&
self
.
topView
==
nil
)
{
[
self
createRemoveAdView
:
expressView
];
}
else
{
[
self
createCountingDowViewByAdView
:
expressView
];
}
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
#pragma mark - ========== 创建删除view ==========
-
(
void
)
createRemoveAdView
:
(
UIView
*
)
expressView
{
UIImageView
*
closeBg
=
[[
UIImageView
alloc
]
init
];
[
expressView
addSubview
:
closeBg
];
closeBg
.
userInteractionEnabled
=
YES
;
closeBg
.
image
=
[
UIImage
imageNamed
:
@"wwww"
];
[
closeBg
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
right
.
equalTo
(
expressView
.
mas_right
).
offset
(
-
5
*
k6Scale
);
make
.
top
.
equalTo
(
expressView
.
mas_top
).
offset
(
5
*
k6Scale
);
}];
UILabel
*
closeLabel
=
[[
UILabel
alloc
]
init
];
closeLabel
.
textColor
=
[
UIColor
colorWithHexString
:
@"#ffffff"
];
[
closeBg
addSubview
:
closeLabel
];
closeLabel
.
font
=
kFontSize
(
12
*
k6Scale
);
[
closeLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
centerX
.
centerY
.
equalTo
(
closeBg
);
}];
closeLabel
.
text
=
@"X 关闭"
;
UITapGestureRecognizer
*
closeCountingDown
=
[[
UITapGestureRecognizer
alloc
]
init
];
[
closeBg
addGestureRecognizer
:
closeCountingDown
];
@weakify
(
self
);
[[
closeCountingDown
rac_gestureSignal
]
subscribeNext
:
^
(
id
x
)
{
@strongify
(
self
);
//移除广告
[
self
removeCoverAd
:
expressView
];
if
(
self
.
closeAction
)
{
self
.
closeAction
();
}
}];
}
#pragma mark - ========== 创建倒计时view ==========
-
(
void
)
createCountingDowViewByAdView
:
(
UIView
*
)
expressView
{
UIImageView
*
closeBg
=
[[
UIImageView
alloc
]
init
];
[
expressView
addSubview
:
closeBg
];
closeBg
.
userInteractionEnabled
=
YES
;
closeBg
.
image
=
[
UIImage
imageNamed
:
@"wwww"
];
[
closeBg
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
right
.
equalTo
(
expressView
.
mas_right
).
offset
(
-
10
*
k6Scale
);
make
.
top
.
equalTo
(
expressView
.
mas_top
).
offset
(
10
*
k6Scale
);
}];
UILabel
*
closeLabel
=
[[
UILabel
alloc
]
init
];
closeLabel
.
textColor
=
[
UIColor
colorWithHexString
:
@"#ffffff"
];
[
closeBg
addSubview
:
closeLabel
];
closeLabel
.
font
=
kFontSize
(
12
*
k6Scale
);
[
closeLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
centerX
.
centerY
.
equalTo
(
closeBg
);
}];
__block
int
cou
=
3
;
closeLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld 跳过"
,
(
long
)
cou
];
UITapGestureRecognizer
*
closeCountingDown
=
[[
UITapGestureRecognizer
alloc
]
init
];
[
closeBg
addGestureRecognizer
:
closeCountingDown
];
self
.
gcdTimer
=
dispatch_source_create
(
DISPATCH_SOURCE_TYPE_TIMER
,
0
,
0
,
dispatch_get_global_queue
(
0
,
0
));
dispatch_source_set_timer
(
self
.
gcdTimer
,
DISPATCH_TIME_NOW
,
1
.
0
*
NSEC_PER_SEC
,
0
.
0
*
NSEC_PER_SEC
);
dispatch_source_set_event_handler
(
self
.
gcdTimer
,
^
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
closeLabel
.
text
=
[
NSString
stringWithFormat
:
@"%d 跳过"
,
(
int
)
cou
];
if
(
cou
==
0
)
{
// 终止定时器
dispatch_cancel
(
self
.
gcdTimer
);
self
.
gcdTimer
=
nil
;
//移除广告
[
self
removeCoverAd
:
expressView
];
}
cou
--
;
});
});
// 启动任务,GCD计时器创建后需要手动启动
dispatch_resume
(
self
.
gcdTimer
);
@weakify
(
self
);
[[
closeCountingDown
rac_gestureSignal
]
subscribeNext
:
^
(
id
x
)
{
@strongify
(
self
);
// 终止定时器
if
(
self
.
gcdTimer
)
{
dispatch_cancel
(
self
.
gcdTimer
);
self
.
gcdTimer
=
nil
;
}
//移除广告
[
self
removeCoverAd
:
expressView
];
}];
}
-
(
void
)
removeCoverAd
:
(
UIView
*
)
expressView
{
expressView
.
hidden
=
YES
;
self
.
nativeAd
.
delegate
=
nil
;
[
expressView
removeFromSuperview
];
}
/**
* 拉取原生模板广告失败
*/
-
(
void
)
nativeExpressAdFailToLoad
:
(
GDTNativeExpressAd
*
)
nativeExpressAd
error
:
(
NSError
*
)
error
{
}
/**
* 原生模板广告渲染成功, 此时的 nativeExpressAdView.size.height 根据 size.width 完成了动态更新。
*/
-
(
void
)
nativeExpressAdViewRenderSuccess
:
(
GDTNativeExpressAdView
*
)
nativeExpressAdView
{
@try
{
//曝光
id
x
=
[
nativeExpressAdView
valueForKey
:
@"adModel"
];
NSString
*
title
=
[
x
valueForKey
:
@"title"
];
NSString
*
imageUrl
=
[
x
valueForKey
:
@"imgUrl"
];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,
[
kUserDefaults
valueForKey
:
@"Ad"
]]
para
:
@{
@"adsenseName"
:
title
.
length
>
30
?[
title
substringToIndex
:
29
]:
title
,
@"advertType"
:
@"曝光"
,
@"advertTitle"
:
title
.
length
>
30
?[
title
substringToIndex
:
29
]:
title
,
@"advertImg"
:
imageUrl
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
kTXAdNativePLACEMENTID
,
@"platformCode"
:
@"TXAD_iOS"
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
/**
* 点击原生模板广告以后即将弹出全屏广告页
*/
-
(
void
)
nativeExpressAdViewWillPresentScreen
:
(
GDTNativeExpressAdView
*
)
nativeExpressAdView
{
@try
{
//点击
id
x
=
[
nativeExpressAdView
valueForKey
:
@"adModel"
];
NSString
*
title
=
[
x
valueForKey
:
@"title"
];
NSString
*
imageUrl
=
[
x
valueForKey
:
@"imgUrl"
];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,
[
kUserDefaults
valueForKey
:
@"Ad"
]]
para
:
@{
@"adsenseName"
:
title
.
length
>
30
?[
title
substringToIndex
:
29
]:
title
,
@"advertType"
:
@"点击"
,
@"advertTitle"
:
title
.
length
>
30
?[
title
substringToIndex
:
29
]:
title
,
@"advertImg"
:
imageUrl
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
kTXAdNativePLACEMENTID
,
@"platformCode"
:
@"TXAD_iOS"
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
/**
* 原生模板广告被关闭
*/
-
(
void
)
nativeExpressAdViewClosed
:
(
GDTNativeExpressAdView
*
)
nativeExpressAdView
{
@try
{
if
(
self
.
topView
)
{
//当前是自助服务
nativeExpressAdView
.
hidden
=
YES
;
[
nativeExpressAdView
removeFromSuperview
];
}
else
{
}
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
#pragma mark - ========== banner广告部分 ==========
-
(
void
)
createBannerAdByPlacmentId
:
(
NSString
*
)
placenmentId
currentViewController
:
(
UIViewController
*
)
viewController
superView
:
(
UIView
*
)
superView
{
CGRect
rect
=
{
CGPointZero
,
GDTMOB_AD_SUGGEST_SIZE_320x50
};
self
.
bannerView
=
[[
GDTMobBannerView
alloc
]
initWithFrame
:
rect
appId
:
kTXAdAPPID
placementId
:
placenmentId
];
self
.
bannerView
.
currentViewController
=
viewController
;
self
.
bannerView
.
interval
=
40
;
self
.
bannerView
.
delegate
=
self
;
self
.
bannerView
.
showCloseBtn
=
YES
;
[
superView
addSubview
:
self
.
bannerView
];
[
superView
bringSubviewToFront
:
self
.
bannerView
];
[
self
.
bannerView
mas_remakeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
right
.
bottom
.
equalTo
(
superView
);
make
.
height
.
mas_equalTo
(
50
);
}];
[
self
loadBannerView
];
}
-
(
void
)
removeBannerAd
{
[
self
.
bannerView
removeFromSuperview
];
self
.
bannerView
=
nil
;
}
-
(
void
)
loadBannerView
{
[
self
.
bannerView
loadAdAndShow
];
}
#pragma mark - GDTMobBannerViewDelegate
// 请求广告条数据成功后调用
//
// 详解:当接收服务器返回的广告数据成功后调用该函数
-
(
void
)
bannerViewDidReceived
{
NSLog
(
@"banner Received"
);
}
// 请求广告条数据失败后调用
//
// 详解:当接收服务器返回的广告数据失败后调用该函数
-
(
void
)
bannerViewFailToReceived
:
(
NSError
*
)
error
{
NSLog
(
@"banner failed to Received : %@"
,
error
);
}
// 广告栏被点击后调用
//
// 详解:当接收到广告栏被点击事件后调用该函数
-
(
void
)
bannerViewClicked
{
NSLog
(
@"banner clicked"
);
}
// 应用进入后台时调用
//
// 详解:当点击下载或者地图类型广告时,会调用系统程序打开,
// 应用将被自动切换到后台
-
(
void
)
bannerViewWillLeaveApplication
{
NSLog
(
@"banner leave application"
);
}
-
(
void
)
bannerViewDidDismissFullScreenModal
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
bannerViewWillDismissFullScreenModal
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
bannerViewWillPresentFullScreenModal
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
-
(
void
)
bannerViewDidPresentFullScreenModal
{
NSLog
(
@"%s"
,
__FUNCTION__
);
}
@end
ColorfulSchool/ColorfulSchool/Classes/Config(配置)/APIManager.m
View file @
4f142d2e
//
//
...
@@ -56,6 +56,8 @@ kSINGLETON_FOR_CLASS(APIManager)
...
@@ -56,6 +56,8 @@ kSINGLETON_FOR_CLASS(APIManager)
[
userDefaults
setObject
:
@"http://ex-dev-dcxy-home-app.168cad.top"
forKey
:
@"HomePage"
];
[
userDefaults
setObject
:
@"http://ex-dev-dcxy-home-app.168cad.top"
forKey
:
@"HomePage"
];
[
userDefaults
setObject
:
@"http://ex-dev-other-device-app.168cad.top"
forKey
:
@"DCWash"
];
[
userDefaults
setObject
:
@"http://ex-dev-other-device-app.168cad.top"
forKey
:
@"DCWash"
];
// [userDefaults setObject:@"http://192.168.100.112:8888" forKey:@"DCWash"];
[
userDefaults
synchronize
];
[
userDefaults
synchronize
];
break
;
break
;
}
}
...
...
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/CustomerTabbar.m
View file @
4f142d2e
//
//
...
@@ -245,9 +245,9 @@
...
@@ -245,9 +245,9 @@
[
button
setTitle
:
title
forState
:
UIControlStateNormal
];
[
button
setTitle
:
title
forState
:
UIControlStateNormal
];
[
button
setTitle
:
@"●"
forState
:
UIControlStateDisabled
];
[
button
setTitle
:
@"●"
forState
:
UIControlStateDisabled
];
[
button
setTitleColor
:[
UIColor
colorWithHexString
:
@"999999"
]
forState
:
UIControlStateNormal
];
[
button
setTitleColor
:[
UIColor
colorWithHexString
:
@"999999"
]
forState
:
UIControlStateNormal
];
button
.
titleLabel
.
font
=
kFontSize
(
10
*
k6Scale
);
button
.
layoutStyle
=
style
;
button
.
layoutStyle
=
style
;
[
button
setTitleColor
:
RGB
(
255
,
165
,
80
)
forState
:
UIControlStateDisabled
];
[
button
setTitleColor
:
RGB
(
255
,
165
,
80
)
forState
:
UIControlStateDisabled
];
button
.
titleLabel
.
font
=
kFontSize
(
12
*
k6Scale
);
button
.
midSpacing
=
2
;
button
.
midSpacing
=
2
;
return
button
;
return
button
;
}
}
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageSupverViewController.m
View file @
4f142d2e
//
//
...
@@ -55,7 +55,11 @@
...
@@ -55,7 +55,11 @@
@weakify
(
self
);
@weakify
(
self
);
[[
back
rac_signalForControlEvents
:
UIControlEventTouchDown
]
subscribeNext
:
^
(
id
x
)
{
[[
back
rac_signalForControlEvents
:
UIControlEventTouchDown
]
subscribeNext
:
^
(
id
x
)
{
@strongify
(
self
);
@strongify
(
self
);
[
self
.
navigationController
popViewControllerAnimated
:
YES
];
if
(
self
.
navigationController
)
{
[
self
.
navigationController
popViewControllerAnimated
:
YES
];
}
else
{
[
self
dismissViewControllerAnimated
:
YES
completion
:
nil
];
}
}];
}];
if
(
self
.
titleStr
)
{
if
(
self
.
titleStr
)
{
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController+Extension.m
View file @
4f142d2e
//
//
...
@@ -408,7 +408,7 @@
...
@@ -408,7 +408,7 @@
return
;
return
;
}
}
ZXHomePageWebViewController
*
bannerVc
=
[[
ZXHomePageWebViewController
alloc
]
init
];
ZXHomePageWebViewController
*
bannerVc
=
[[
ZXHomePageWebViewController
alloc
]
init
];
bannerVc
.
jumpUrl
=
[
self
formatJumpUrl
:
child
.
iosButtAddress
];
bannerVc
.
jumpUrl
=
[
ZXTool
formatJumpUrl
:
child
.
iosButtAddress
];
bannerVc
.
hidesBottomBarWhenPushed
=
YES
;
bannerVc
.
hidesBottomBarWhenPushed
=
YES
;
[
self
.
navigationController
pushViewController
:
bannerVc
animated
:
YES
];
[
self
.
navigationController
pushViewController
:
bannerVc
animated
:
YES
];
}
}
...
@@ -487,10 +487,4 @@
...
@@ -487,10 +487,4 @@
}
}
-
(
NSString
*
)
formatJumpUrl
:
(
NSString
*
)
jumpUrl
{
ASIdentifierManager
*
asIM
=
[[
ASIdentifierManager
alloc
]
init
];
NSString
*
idfa
=
[
asIM
.
advertisingIdentifier
UUIDString
];
NSString
*
j_url
=
[[[[[[[
jumpUrl
stringByReplacingOccurrencesOfString
:
@"${schoolid}"
withString
:
CacheCampusId
?
CacheCampusId
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${userid}"
withString
:
CacheUserId
?
CacheUserId
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${im}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${ia}"
withString
:
idfa
?
idfa
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${imMD5}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${androidId}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${versionid}"
withString
:
APPversion
?
APPversion
:
@""
];
return
j_url
;
}
@end
@end
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m
View file @
4f142d2e
//
//
...
@@ -91,15 +91,15 @@
...
@@ -91,15 +91,15 @@
//收到修改了用户信息的通知
//收到修改了用户信息的通知
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
changeUserNameAction
:
)
name
:
@"changeUserNameNotification"
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
changeUserNameAction
:
)
name
:
@"changeUserNameNotification"
object
:
nil
];
//
//测试按钮
//测试按钮
//
UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(100, kScreenHeight - 100, 80, 80)];
UIButton
*
btn
=
[[
UIButton
alloc
]
initWithFrame
:
CGRectMake
(
100
,
kScreenHeight
-
100
,
80
,
80
)];
//
[self.view addSubview:btn];
[
self
.
view
addSubview
:
btn
];
//
btn.backgroundColor = [UIColor orangeColor];
btn
.
backgroundColor
=
[
UIColor
orangeColor
];
//
[[btn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
[[
btn
rac_signalForControlEvents
:
UIControlEventTouchDown
]
subscribeNext
:
^
(
id
x
)
{
//
UIViewController *vc = [[NSClassFromString(@"DC_ZXWashTabbarViewController") alloc] init];
UIViewController
*
vc
=
[[
NSClassFromString
(
@"DC_ZXWashTabbarViewController"
)
alloc
]
init
];
//
vc.hidesBottomBarWhenPushed = YES;
vc
.
hidesBottomBarWhenPushed
=
YES
;
//
[self.navigationController pushViewController:vc animated:YES];
[
self
.
navigationController
pushViewController
:
vc
animated
:
YES
];
//
}];
}];
}
}
-
(
void
)
viewWillLayoutSubviews
{
-
(
void
)
viewWillLayoutSubviews
{
[
super
viewWillLayoutSubviews
];
[
super
viewWillLayoutSubviews
];
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageWebViewController.m
View file @
4f142d2e
//
//
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
[
self
.
contentView
addSubview
:
_webView
];
[
self
.
contentView
addSubview
:
_webView
];
[
_webView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
[
_webView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
edges
.
equalTo
(
self
.
contentView
)
.
insets
(
UIEdgeInsetsMake
(
10
*
k6Scale
,
15
*
k6Scale
,
10
*
k6Scale
,
15
*
k6Scale
))
;
make
.
edges
.
equalTo
(
self
.
contentView
);
}];
}];
}
}
return
_webView
;
return
_webView
;
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSteamCell.m
View file @
4f142d2e
//
//
...
@@ -44,9 +44,8 @@
...
@@ -44,9 +44,8 @@
_child
=
child
;
_child
=
child
;
self
.
isJump
=
NO
;
self
.
isJump
=
NO
;
if
(
_child
.
iosButtAddress
)
{
if
(
_child
.
iosButtAddress
)
{
ASIdentifierManager
*
asIM
=
[[
ASIdentifierManager
alloc
]
init
];
NSString
*
idfa
=
[
asIM
.
advertisingIdentifier
UUIDString
];
NSString
*
jumpUrl
=
[
ZXTool
formatJumpUrl
:
_child
.
iosButtAddress
];
NSString
*
jumpUrl
=
[[[[[[[
_child
.
iosButtAddress
stringByReplacingOccurrencesOfString
:
@"${schoolid}"
withString
:
CacheCampusId
?
CacheCampusId
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${userid}"
withString
:
CacheUserId
?
CacheUserId
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${im}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${ia}"
withString
:
idfa
?
idfa
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${imMD5}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${androidId}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${versionid}"
withString
:
APPversion
?
APPversion
:
@""
];
self
.
webUrl
=
jumpUrl
;
self
.
webUrl
=
jumpUrl
;
[
self
.
webView
loadRequest
:[
NSURLRequest
requestWithURL
:[
NSURL
URLWithString
:
jumpUrl
]]];
[
self
.
webView
loadRequest
:[
NSURLRequest
requestWithURL
:[
NSURL
URLWithString
:
jumpUrl
]]];
}
}
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/ViewModel/ZXHomePageService.m
View file @
4f142d2e
//
//
...
@@ -206,13 +206,14 @@
...
@@ -206,13 +206,14 @@
}
}
info
.
isExposured
=
YES
;
info
.
isExposured
=
YES
;
NSDictionary
*
dic
=
@{
@"adsenseName"
:
info
.
blockName
.
length
>
30
?[
info
.
blockName
substringToIndex
:
29
]:
info
.
blockName
,
@"advertType"
:
@"曝光"
,
@"advertTitle"
:
info
.
itemTitle
.
length
>
30
?[
info
.
itemTitle
substringToIndex
:
29
]:
info
.
itemTitle
,
@"advertImg"
:
info
.
itemImgs
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
info
.
itemCode
,
@"platformCode"
:
@"DCXY_iOS"
};
NSDictionary
*
dic
=
@{
@"adsenseName"
:
info
.
blockName
.
length
>
30
?[
info
.
blockName
substringToIndex
:
29
]:
info
.
blockName
,
@"advertType"
:
@"曝光"
,
@"advertTitle"
:
info
.
itemTitle
.
length
>
30
?[
info
.
itemTitle
substringToIndex
:
29
]:
info
.
itemTitle
,
@"advertImg"
:
info
.
itemImgs
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
info
.
itemCode
,
@"platformCode"
:
@"DCXY_iOS"
};
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:
info
.
showAddressIos
para
:
dic
completed
:
nil
];
//内部曝光
//内部曝光
NSString
*
url
=
[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,[
kUserDefaults
valueForKey
:
@"Ad"
]];
NSString
*
url
=
[
NSString
stringWithFormat
:
@"%@/app/adsenseCollectData/adsenseCollectData4Add"
,[
kUserDefaults
valueForKey
:
@"Ad"
]];
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:
url
para
:
dic
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodPOST
url
:
url
para
:
dic
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
}];
}];
//外部曝光
[
ZXTool
requestDataHideLoadingToastWithType
:
kXMHTTPMethodGET
url
:[
ZXTool
formatJumpUrl
:
info
.
showAddressIos
]
para
:
nil
completed
:
nil
];
}
}
}
}
#pragma mark - 点击
#pragma mark - 点击
...
@@ -223,7 +224,6 @@
...
@@ -223,7 +224,6 @@
}
}
info
.
isClicked
=
YES
;
info
.
isClicked
=
YES
;
NSDictionary
*
dic
=
@{
@"adsenseName"
:
info
.
blockName
.
length
>
30
?[
info
.
blockName
substringToIndex
:
29
]:
info
.
blockName
,
@"advertType"
:
@"点击"
,
@"advertTitle"
:
info
.
itemTitle
.
length
>
30
?[
info
.
itemTitle
substringToIndex
:
29
]:
info
.
itemTitle
,
@"advertImg"
:
info
.
itemImgs
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
info
.
itemCode
,
@"platformCode"
:
@"DCXY_iOS"
};
NSDictionary
*
dic
=
@{
@"adsenseName"
:
info
.
blockName
.
length
>
30
?[
info
.
blockName
substringToIndex
:
29
]:
info
.
blockName
,
@"advertType"
:
@"点击"
,
@"advertTitle"
:
info
.
itemTitle
.
length
>
30
?[
info
.
itemTitle
substringToIndex
:
29
]:
info
.
itemTitle
,
@"advertImg"
:
info
.
itemImgs
,
@"customerId"
:
[
kUserDefaults
valueForKey
:
@"userId"
],
@"advertId"
:
info
.
itemCode
,
@"platformCode"
:
@"DCXY_iOS"
};
//内部点击
//内部点击
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/Drink(壁挂饮水)/Controller/ZXDrinkViewController.m
View file @
4f142d2e
//
//
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
#pragma mark - ========== 创建导航栏 ==========
#pragma mark - ========== 创建导航栏 ==========
-
(
void
)
createNabar
{
-
(
void
)
createNabar
{
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
drinkbackgroun
d"
];
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
bg_ami_car
d"
];
CGFloat
height
=
262
*
k6Scale
;
CGFloat
height
=
262
*
k6Scale
;
if
(
iPhoneX
)
{
if
(
iPhoneX
)
{
height
=
height
+
24
;
height
=
height
+
24
;
...
@@ -129,12 +129,12 @@
...
@@ -129,12 +129,12 @@
}
}
-
(
void
)
createHeader
{
-
(
void
)
createHeader
{
UIImageView
*
header
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
205
*
k6Scale
)];
UIImageView
*
header
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
205
*
k6Scale
)];
header
.
image
=
[
UIImage
imageNamed
:
@"
drinkbackgroun
d"
];
header
.
image
=
[
UIImage
imageNamed
:
@"
bg_ami_car
d"
];
self
.
myTableView
.
tableHeaderView
=
header
;
self
.
myTableView
.
tableHeaderView
=
header
;
header
.
userInteractionEnabled
=
YES
;
header
.
userInteractionEnabled
=
YES
;
UIImageView
*
top
=
[[
UIImageView
alloc
]
init
];
UIImageView
*
top
=
[[
UIImageView
alloc
]
init
];
[
header
addSubview
:
top
];
[
header
addSubview
:
top
];
top
.
image
=
[
UIImage
imageNamed
:
@"drink-frame"
]
;
top
.
image
=
kToppicBgImage
;
[
top
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
[
top
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
width
.
mas_equalTo
(
260
*
k6Scale
);
make
.
width
.
mas_equalTo
(
260
*
k6Scale
);
make
.
height
.
mas_equalTo
(
84
*
k6Scale
);
make
.
height
.
mas_equalTo
(
84
*
k6Scale
);
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/bath(洗浴)/ZXBathViewController.m
View file @
4f142d2e
//
//
...
@@ -128,16 +128,16 @@
...
@@ -128,16 +128,16 @@
}];
}];
//MARK:观察是否收到socket反馈设备信息
//MARK:观察是否收到socket反馈设备信息
[
RACObserve
(
self
,
isReciveDeviceInfo
)
subscribeNext
:
^
(
id
_Nullable
x
)
{
//
[RACObserve(self, isReciveDeviceInfo) subscribeNext:^(id _Nullable x) {
@strongify
(
self
);
//
@strongify(self);
if
([
x
integerValue
])
{
//
if ([x integerValue]) {
//开始洗浴
//
//开始洗浴
if
(
self
.
isBegingBath
==
NO
)
{
//
if (self.isBegingBath == NO) {
self
.
isBegingBath
=
YES
;
//
self.isBegingBath = YES;
[
self
startBathByBluetooth
];
//调用接口
//
[self startBathByBluetooth];//调用接口
}
//
}
}
//
}
}];
//
}];
}
}
#pragma mark - ==========读取本地缓存数据==========
#pragma mark - ==========读取本地缓存数据==========
...
@@ -164,7 +164,7 @@
...
@@ -164,7 +164,7 @@
#pragma mark - ========== 创建导航栏 ==========
#pragma mark - ========== 创建导航栏 ==========
-
(
void
)
createNabar
{
-
(
void
)
createNabar
{
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
drinkbackgroun
d"
];
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
bg_ami_car
d"
];
CGFloat
height
=
262
*
k6Scale
;
CGFloat
height
=
262
*
k6Scale
;
if
(
iPhoneX
)
{
if
(
iPhoneX
)
{
height
=
height
+
24
;
height
=
height
+
24
;
...
@@ -269,12 +269,12 @@
...
@@ -269,12 +269,12 @@
-
(
void
)
createUI
{
-
(
void
)
createUI
{
UIImageView
*
header
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
kTopHeight
,
kScreenWidth
,
205
*
k6Scale
)];
UIImageView
*
header
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
kTopHeight
,
kScreenWidth
,
205
*
k6Scale
)];
header
.
image
=
[
UIImage
imageNamed
:
@"
drinkbackgroun
d"
];
header
.
image
=
[
UIImage
imageNamed
:
@"
bg_ami_car
d"
];
[
self
.
view
addSubview
:
header
];
[
self
.
view
addSubview
:
header
];
header
.
userInteractionEnabled
=
YES
;
header
.
userInteractionEnabled
=
YES
;
UIImageView
*
top
=
[[
UIImageView
alloc
]
init
];
UIImageView
*
top
=
[[
UIImageView
alloc
]
init
];
[
header
addSubview
:
top
];
[
header
addSubview
:
top
];
top
.
image
=
[
UIImage
imageNamed
:
@"drink-frame"
]
;
top
.
image
=
kToppicBgImage
;
[
top
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
[
top
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
width
.
mas_equalTo
(
260
*
k6Scale
);
make
.
width
.
mas_equalTo
(
260
*
k6Scale
);
make
.
height
.
mas_equalTo
(
84
*
k6Scale
);
make
.
height
.
mas_equalTo
(
84
*
k6Scale
);
...
@@ -691,15 +691,22 @@
...
@@ -691,15 +691,22 @@
-
(
void
)
peripheral
:
(
CBPeripheral
*
)
peripheral
didDiscoverCharacteristicsForService
:
(
CBService
*
)
service
error
:
(
NSError
*
)
error
{
-
(
void
)
peripheral
:
(
CBPeripheral
*
)
peripheral
didDiscoverCharacteristicsForService
:
(
CBService
*
)
service
error
:
(
NSError
*
)
error
{
NSLog
(
@"=========================蓝牙连接成功========================="
);
NSLog
(
@"=========================蓝牙连接成功========================="
);
//[SVProgressHUD showSuccessWithStatus:@"蓝牙连接成功"];
//[SVProgressHUD showSuccessWithStatus:@"蓝牙连接成功"];
[
self
sendDeviceInfoToSocketByTimes
:
1
];
//开始洗浴
if
(
self
.
isBegingBath
==
NO
)
{
self
.
isBegingBath
=
YES
;
[
self
startBathByBluetooth
];
//调用接口
}
//三秒之后查看状态 如果还是没有收到 直接cancel掉所有连接 提示错误信息
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
4
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
// [self sendDeviceInfoToSocketByTimes:1];
if
(
self
.
isReciveDeviceInfo
==
NO
)
{
[
ZXTool
hideLoadingAnimation
];
// //三秒之后查看状态 如果还是没有收到 直接cancel掉所有连接 提示错误信息
[
SVProgressHUD
showErrorWithStatus
:
@"未收到socket服务器响应的设备信息,请稍后再试!"
];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
}
// if (self.isReciveDeviceInfo == NO) {
});
// [ZXTool hideLoadingAnimation];
// [SVProgressHUD showErrorWithStatus:@"未收到socket服务器响应的设备信息,请稍后再试!"];
// }
// });
for
(
CBCharacteristic
*
characteristic
in
service
.
characteristics
)
{
for
(
CBCharacteristic
*
characteristic
in
service
.
characteristics
)
{
[
peripheral
setNotifyValue
:
YES
forCharacteristic
:
characteristic
];
[
peripheral
setNotifyValue
:
YES
forCharacteristic
:
characteristic
];
...
@@ -775,11 +782,9 @@
...
@@ -775,11 +782,9 @@
NSDictionary
*
options
=
@{
CBCentralManagerOptionShowPowerAlertKey
:
@NO
};
//不弹窗(配置)
NSDictionary
*
options
=
@{
CBCentralManagerOptionShowPowerAlertKey
:
@NO
};
//不弹窗(配置)
self
.
centralManager
=
[[
CBCentralManager
alloc
]
initWithDelegate
:
self
queue
:
nil
options
:
options
];
self
.
centralManager
=
[[
CBCentralManager
alloc
]
initWithDelegate
:
self
queue
:
nil
options
:
options
];
}
}
if
(
self
.
selectedPeripheral
)
{
if
(
self
.
selectedPeripheral
&&
self
.
selectedPeripheral
.
state
!=
CBPeripheralStateConnected
)
{
if
(
self
.
selectedPeripheral
.
state
!=
CBPeripheralStateConnected
)
{
//连接成功
//连接成功
[
self
.
centralManager
connectPeripheral
:
self
.
selectedPeripheral
options
:
nil
];
[
self
.
centralManager
connectPeripheral
:
self
.
selectedPeripheral
options
:
nil
];
}
}
else
{
}
else
{
[
self
.
centralManager
scanForPeripheralsWithServices
:
nil
options
:@{
CBCentralManagerScanOptionAllowDuplicatesKey
:
@YES
}];
[
self
.
centralManager
scanForPeripheralsWithServices
:
nil
options
:@{
CBCentralManagerScanOptionAllowDuplicatesKey
:
@YES
}];
}
}
...
@@ -887,7 +892,7 @@
...
@@ -887,7 +892,7 @@
[
self
cutBluetoothAndSocketConnect
];
[
self
cutBluetoothAndSocketConnect
];
}
else
if
([
text
isEqualToString
:
@"[]"
])
{
}
else
if
([
text
isEqualToString
:
@"[]"
])
{
}
else
if
([
text
isEqualToString
:[
NSString
stringWithFormat
:
@"
[<%@>]
"
,
self
.
currentPeripheralName
]])
{
}
else
if
([
text
isEqualToString
:[
NSString
stringWithFormat
:
@"
{<%@>}
"
,
self
.
currentPeripheralName
]])
{
self
.
isReciveDeviceInfo
=
YES
;
self
.
isReciveDeviceInfo
=
YES
;
NSLog
(
@"=============收到服务器返回的设备号"
);
NSLog
(
@"=============收到服务器返回的设备号"
);
}
else
{
}
else
{
...
@@ -920,6 +925,9 @@
...
@@ -920,6 +925,9 @@
}
}
}
}
}
}
}
}
// 链接失败
// 链接失败
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXWashCloseViewController.m
View file @
4f142d2e
//
//
...
@@ -166,8 +166,8 @@
...
@@ -166,8 +166,8 @@
-
(
void
)
createNabar
{
-
(
void
)
createNabar
{
[
UIApplication
sharedApplication
].
statusBarHidden
=
NO
;
[
UIApplication
sharedApplication
].
statusBarHidden
=
NO
;
[
UIApplication
sharedApplication
].
statusBarStyle
=
UIStatusBarStyleLightContent
;
[
UIApplication
sharedApplication
].
statusBarStyle
=
UIStatusBarStyleLightContent
;
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
wash-bg
"
];
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
bg_ami_card
"
];
UIImageView
*
nabar
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
k
ScreenWidth
*
image
.
size
.
height
/
image
.
size
.
width
)];
UIImageView
*
nabar
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
k
TopHeight
)];
nabar
.
userInteractionEnabled
=
YES
;
nabar
.
userInteractionEnabled
=
YES
;
nabar
.
image
=
image
;
nabar
.
image
=
image
;
...
@@ -249,10 +249,10 @@
...
@@ -249,10 +249,10 @@
return
_myTableView
;
return
_myTableView
;
}
}
-
(
void
)
createTableHeader
{
-
(
void
)
createTableHeader
{
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
wash-bg
"
];
UIImage
*
image
=
[
UIImage
imageNamed
:
@"
bg_ami_card
"
];
UIView
*
tableHeader
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
kScreenWidth
*
image
.
size
.
height
/
image
.
size
.
width
+
1
0
*
k6Scale
)];
UIView
*
tableHeader
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
16
0
*
k6Scale
)];
tableHeader
.
backgroundColor
=
kRGBColor
(
242
,
242
,
242
,
1
);
tableHeader
.
backgroundColor
=
kRGBColor
(
242
,
242
,
242
,
1
);
UIImageView
*
header
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
kScreenWidth
*
image
.
size
.
height
/
image
.
size
.
width
)];
UIImageView
*
header
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
150
*
k6Scale
)];
[
tableHeader
addSubview
:
header
];
[
tableHeader
addSubview
:
header
];
header
.
contentMode
=
UIViewContentModeBottomLeft
|
UIViewContentModeBottomRight
;
header
.
contentMode
=
UIViewContentModeBottomLeft
|
UIViewContentModeBottomRight
;
header
.
clipsToBounds
=
YES
;
header
.
clipsToBounds
=
YES
;
...
@@ -307,7 +307,7 @@
...
@@ -307,7 +307,7 @@
UIView
*
textBg
=
[[
UIView
alloc
]
init
];
UIView
*
textBg
=
[[
UIView
alloc
]
init
];
[
header
addSubview
:
textBg
];
[
header
addSubview
:
textBg
];
textBg
.
backgroundColor
=
kRGBColor
(
255
,
2
18
,
186
,
1
);
textBg
.
backgroundColor
=
kRGBColor
(
255
,
2
55
,
255
,
0
.
5
);
[
textBg
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
[
textBg
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
equalTo
(
header
.
mas_left
).
offset
(
57
.
5
*
k6Scale
);
make
.
left
.
equalTo
(
header
.
mas_left
).
offset
(
57
.
5
*
k6Scale
);
make
.
top
.
equalTo
(
header
.
mas_top
).
offset
(
15
*
k6Scale
);
make
.
top
.
equalTo
(
header
.
mas_top
).
offset
(
15
*
k6Scale
);
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXWashOrderDetailViewController.m
View file @
4f142d2e
//
//
...
@@ -140,7 +140,7 @@
...
@@ -140,7 +140,7 @@
UIView
*
footer
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
44
*
k6Scale
)];
UIView
*
footer
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
kScreenWidth
,
44
*
k6Scale
)];
UIButton
*
okPay
=
[[
UIButton
alloc
]
initWithFrame
:
CGRectMake
(
22
.
5
*
k6Scale
,
0
,
kScreenWidth
-
45
*
k6Scale
,
44
*
k6Scale
)];
UIButton
*
okPay
=
[[
UIButton
alloc
]
initWithFrame
:
CGRectMake
(
22
.
5
*
k6Scale
,
0
,
kScreenWidth
-
45
*
k6Scale
,
44
*
k6Scale
)];
[
footer
addSubview
:
okPay
];
[
footer
addSubview
:
okPay
];
okPay
.
backgroundColor
=
[
UIColor
colorWithHexString
:
@"#fe940a"
]
;
okPay
.
backgroundColor
=
kTopicColor
;
okPay
.
layer
.
cornerRadius
=
5
*
k6Scale
;
okPay
.
layer
.
cornerRadius
=
5
*
k6Scale
;
okPay
.
layer
.
masksToBounds
=
YES
;
okPay
.
layer
.
masksToBounds
=
YES
;
[
okPay
setTitle
:
@"确认支付"
forState
:
UIControlStateNormal
];
[
okPay
setTitle
:
@"确认支付"
forState
:
UIControlStateNormal
];
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXWashTabbarViewController.m
View file @
4f142d2e
//
//
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
[
super
viewDidLoad
];
[
super
viewDidLoad
];
self
.
tabBarController
.
tabBar
.
hidden
=
YES
;
self
.
tabBarController
.
tabBar
.
hidden
=
YES
;
self
.
tabBar
.
hidden
=
NO
;
self
.
tabBar
.
hidden
=
NO
;
self
.
tabBar
.
backgroundColor
=
[
UIColor
whiteColor
];
ZXWashCloseViewController
*
washVc
=
[[
ZXWashCloseViewController
alloc
]
init
];
ZXWashCloseViewController
*
washVc
=
[[
ZXWashCloseViewController
alloc
]
init
];
ZXLocationViewController
*
locationVC
=
[[
ZXLocationViewController
alloc
]
init
];
ZXLocationViewController
*
locationVC
=
[[
ZXLocationViewController
alloc
]
init
];
ZXWashRecordViewController
*
recordVC
=
[[
ZXWashRecordViewController
alloc
]
init
];
ZXWashRecordViewController
*
recordVC
=
[[
ZXWashRecordViewController
alloc
]
init
];
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/View/ZXWashOperationCell.m
View file @
4f142d2e
//
//
...
@@ -76,7 +76,11 @@
...
@@ -76,7 +76,11 @@
_require
=
require
;
_require
=
require
;
self
.
nameLabel
.
text
=
_require
.
alias
;
self
.
nameLabel
.
text
=
_require
.
alias
;
self
.
timeLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld分钟"
,
(
long
)
_require
.
runningTime
];
self
.
timeLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld分钟"
,
(
long
)
_require
.
runningTime
];
self
.
moneyLabel
.
text
=
[
NSString
stringWithFormat
:
@"¥ %.2f"
,
_require
.
price
];
if
(
_require
.
price
>
0
)
{
self
.
moneyLabel
.
text
=
[
NSString
stringWithFormat
:
@"¥ %.2f"
,
_require
.
price
];
}
else
{
self
.
moneyLabel
.
text
=
@"免费"
;
}
if
(
_require
.
isSelect
)
{
if
(
_require
.
isSelect
)
{
self
.
contentView
.
backgroundColor
=
[
UIColor
colorWithHexString
:
@"#fff4ec"
];
self
.
contentView
.
backgroundColor
=
[
UIColor
colorWithHexString
:
@"#fff4ec"
];
self
.
moneyLabel
.
textColor
=
[
UIColor
colorWithHexString
:
@"#cd0000"
];
self
.
moneyLabel
.
textColor
=
[
UIColor
colorWithHexString
:
@"#cd0000"
];
...
...
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXRegistorViewController.m
View file @
4f142d2e
//
//
...
@@ -676,7 +676,7 @@
...
@@ -676,7 +676,7 @@
};
};
}
}
[
ZXTool
requestDataWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/app/customer/register"
,
[
kUserDefaults
objectForKey
:
@"
Recharge
"
]]
para
:
dic
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
[
ZXTool
requestDataWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/app/customer/register"
,
[
kUserDefaults
objectForKey
:
@"
NEW_PAY
"
]]
para
:
dic
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
[
ZXTool
hideLoadingAnimation
];
[
ZXTool
hideLoadingAnimation
];
if
(
error
)
{
if
(
error
)
{
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.xib
View file @
4f142d2e
<?xml
version="1.0" encoding="UTF-8"?>
<?xml
version="1.0" encoding="UTF-8"?>
...
@@ -76,8 +76,8 @@
...
@@ -76,8 +76,8 @@
<color
key=
"textColor"
red=
"1"
green=
"1"
blue=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
key=
"textColor"
red=
"1"
green=
"1"
blue=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"我的艾米
卡额
"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"vnd-Te-9Ha"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"我的艾米"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"vnd-Te-9Ha"
>
<rect
key=
"frame"
x=
"20"
y=
"101"
width=
"
92
"
height=
"18"
/>
<rect
key=
"frame"
x=
"20"
y=
"101"
width=
"
61.5
"
height=
"18"
/>
<fontDescription
key=
"fontDescription"
type=
"boldSystem"
pointSize=
"15"
/>
<fontDescription
key=
"fontDescription"
type=
"boldSystem"
pointSize=
"15"
/>
<color
key=
"textColor"
red=
"1"
green=
"1"
blue=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
key=
"textColor"
red=
"1"
green=
"1"
blue=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/ZXConfirmPayViewController.m
View file @
4f142d2e
//
//
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
payDescLabelLeft
.
font
=
kFontSize
(
16
*
k6Scale
);
payDescLabelLeft
.
font
=
kFontSize
(
16
*
k6Scale
);
payDescLabelLeft
.
textColor
=
[
UIColor
colorWithHexString
:
@"#1e1e1e"
];
payDescLabelLeft
.
textColor
=
[
UIColor
colorWithHexString
:
@"#1e1e1e"
];
[
topView
addSubview
:
payDescLabelLeft
];
[
topView
addSubview
:
payDescLabelLeft
];
payDescLabelLeft
.
text
=
@"购买艾米
卡额
"
;
payDescLabelLeft
.
text
=
@"购买艾米"
;
[
payDescLabelLeft
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
[
payDescLabelLeft
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
bottom
.
equalTo
(
line
);
make
.
left
.
bottom
.
equalTo
(
line
);
make
.
top
.
equalTo
(
topView
.
mas_top
);
make
.
top
.
equalTo
(
topView
.
mas_top
);
...
@@ -171,6 +171,7 @@
...
@@ -171,6 +171,7 @@
@weakify
(
self
);
@weakify
(
self
);
__weak
typeof
(
confirmBtn
)
weakConfirmVtn
=
confirmBtn
;
__weak
typeof
(
confirmBtn
)
weakConfirmVtn
=
confirmBtn
;
[
ZXTool
requestDataWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/dcxy/app/rechargeOrder/rechargeOrder/sure"
,
[
kUserDefaults
valueForKey
:
@"NEW_PAY"
]]
para
:
@{
@"customerId"
:
userId
,
@"id"
:
[
NSString
stringWithFormat
:
@"%ld"
,
(
long
)
self
.
rechargeId
],
@"isFirstRecharge"
:
self
.
isFirstRecharge
?
@"0"
:
@"1"
,
@"rechargeType"
:
self
.
payType
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
[
ZXTool
requestDataWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/dcxy/app/rechargeOrder/rechargeOrder/sure"
,
[
kUserDefaults
valueForKey
:
@"NEW_PAY"
]]
para
:
@{
@"customerId"
:
userId
,
@"id"
:
[
NSString
stringWithFormat
:
@"%ld"
,
(
long
)
self
.
rechargeId
],
@"isFirstRecharge"
:
self
.
isFirstRecharge
?
@"0"
:
@"1"
,
@"rechargeType"
:
self
.
payType
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
@strongify
(
self
);
dispatch_async
(
dispatch_get_main_queue
(),
^
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
weakConfirmVtn
.
enabled
=
YES
;
weakConfirmVtn
.
enabled
=
YES
;
[
ZXTool
hideLoadingAnimation
];
[
ZXTool
hideLoadingAnimation
];
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/View/TopupWalletCell.xib
View file @
4f142d2e
<?xml
version="1.0" encoding="UTF-8"?>
<?xml
version="1.0" encoding="UTF-8"?>
...
@@ -24,8 +24,8 @@
...
@@ -24,8 +24,8 @@
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"IDV-in-7uY"
>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"IDV-in-7uY"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"320"
height=
"39"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"320"
height=
"39"
/>
<subviews>
<subviews>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"购买艾米
卡额
"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"vDZ-fL-dRj"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"购买艾米"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"vDZ-fL-dRj"
>
<rect
key=
"frame"
x=
"12"
y=
"12.5"
width=
"
74
"
height=
"14.5"
/>
<rect
key=
"frame"
x=
"12"
y=
"12.5"
width=
"
49.5
"
height=
"14.5"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"12"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.1176470588"
green=
"0.1176470588"
blue=
"0.1176470588"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.1176470588"
green=
"0.1176470588"
blue=
"0.1176470588"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserInfo/Controller/UserInfoViewController.m
View file @
4f142d2e
//
//
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#import "LoginModel.h"
#import "LoginModel.h"
#import "LimitInput.h"
#import "LimitInput.h"
#import "ZXUserModel.h"
#import "ZXUserModel.h"
#import "enlargeClickRegionBtn.h"
@interface
UserInfoViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
ZHPickViewDelegate
>
{
@interface
UserInfoViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
ZHPickViewDelegate
>
{
NSMutableArray
*
dataArray
;
NSMutableArray
*
dataArray
;
...
@@ -25,6 +26,7 @@
...
@@ -25,6 +26,7 @@
int
CellTag
;
int
CellTag
;
}
}
@property
(
weak
,
nonatomic
)
IBOutlet
UIImageView
*
iconImageView
;
@property
(
weak
,
nonatomic
)
IBOutlet
UIImageView
*
iconImageView
;
@property
(
weak
,
nonatomic
)
IBOutlet
NSLayoutConstraint
*
topViewConstant
;
/**
/**
头像旁边名字
头像旁边名字
...
@@ -36,6 +38,7 @@
...
@@ -36,6 +38,7 @@
*/
*/
@property
(
strong
,
nonatomic
)
IBOutlet
UILabel
*
countLabel
;
@property
(
strong
,
nonatomic
)
IBOutlet
UILabel
*
countLabel
;
@property
(
weak
,
nonatomic
)
IBOutlet
enlargeClickRegionBtn
*
BackBtn
;
@property
(
weak
,
nonatomic
)
IBOutlet
NSLayoutConstraint
*
naConstant
;
@property
(
weak
,
nonatomic
)
IBOutlet
NSLayoutConstraint
*
naConstant
;
...
@@ -81,6 +84,7 @@
...
@@ -81,6 +84,7 @@
kViewRadius
(
self
.
iconImageView
,
40
);
kViewRadius
(
self
.
iconImageView
,
40
);
self
.
naConstant
.
constant
=
kStatusBarHeight
+
6
;
self
.
naConstant
.
constant
=
kStatusBarHeight
+
6
;
self
.
topViewConstant
.
constant
=
kTopHeight
+
120
;
self
.
tableView
.
delegate
=
self
;
self
.
tableView
.
delegate
=
self
;
self
.
tableView
.
dataSource
=
self
;
self
.
tableView
.
dataSource
=
self
;
self
.
tableView
.
tableFooterView
=
[
UIView
new
];
self
.
tableView
.
tableFooterView
=
[
UIView
new
];
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserInfo/Controller/UserInfoViewController.xib
View file @
4f142d2e
<?xml
version="1.0" encoding="UTF-8"?>
<?xml
version="1.0" encoding="UTF-8"?>
...
@@ -11,11 +11,13 @@
...
@@ -11,11 +11,13 @@
<objects>
<objects>
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
customClass=
"UserInfoViewController"
>
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
customClass=
"UserInfoViewController"
>
<connections>
<connections>
<outlet
property=
"BackBtn"
destination=
"B2U-xJ-iwx"
id=
"iC5-pa-Hd5"
/>
<outlet
property=
"countLabel"
destination=
"gjl-Oz-xQK"
id=
"42K-Mw-0bS"
/>
<outlet
property=
"countLabel"
destination=
"gjl-Oz-xQK"
id=
"42K-Mw-0bS"
/>
<outlet
property=
"iconImageView"
destination=
"8Ve-aK-QjO"
id=
"grF-3I-Beo"
/>
<outlet
property=
"iconImageView"
destination=
"8Ve-aK-QjO"
id=
"grF-3I-Beo"
/>
<outlet
property=
"naConstant"
destination=
"iPv-Gl-qaJ"
id=
"Vjw-lC-gar"
/>
<outlet
property=
"naConstant"
destination=
"iPv-Gl-qaJ"
id=
"Vjw-lC-gar"
/>
<outlet
property=
"nameLabel"
destination=
"383-j9-XU4"
id=
"p4D-Rh-rTR"
/>
<outlet
property=
"nameLabel"
destination=
"383-j9-XU4"
id=
"p4D-Rh-rTR"
/>
<outlet
property=
"tableView"
destination=
"ysd-OO-Byz"
id=
"aEf-EX-cco"
/>
<outlet
property=
"tableView"
destination=
"ysd-OO-Byz"
id=
"aEf-EX-cco"
/>
<outlet
property=
"topViewConstant"
destination=
"e5h-GJ-Fzf"
id=
"01r-z0-US0"
/>
<outlet
property=
"view"
destination=
"i5M-Pr-FkT"
id=
"sfx-zR-JGt"
/>
<outlet
property=
"view"
destination=
"i5M-Pr-FkT"
id=
"sfx-zR-JGt"
/>
</connections>
</connections>
</placeholder>
</placeholder>
...
@@ -27,18 +29,18 @@
...
@@ -27,18 +29,18 @@
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"wRZ-Pu-923"
>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"wRZ-Pu-923"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"213"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"213"
/>
<subviews>
<subviews>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"
mineNavBg
"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Dmk-Ex-6bG"
>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"
bg_ami_card
"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Dmk-Ex-6bG"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"213"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"213"
/>
</imageView>
</imageView>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"Head-portrait"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"8Ve-aK-QjO"
>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"Head-portrait"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"8Ve-aK-QjO"
>
<rect
key=
"frame"
x=
"21"
y=
"
96
"
width=
"80"
height=
"80"
/>
<rect
key=
"frame"
x=
"21"
y=
"
113
"
width=
"80"
height=
"80"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"80"
id=
"WpZ-6c-kAN"
/>
<constraint
firstAttribute=
"height"
constant=
"80"
id=
"WpZ-6c-kAN"
/>
<constraint
firstAttribute=
"width"
constant=
"80"
id=
"uYv-9V-SWh"
/>
<constraint
firstAttribute=
"width"
constant=
"80"
id=
"uYv-9V-SWh"
/>
</constraints>
</constraints>
</imageView>
</imageView>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"X6K-MS-ziL"
>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"X6K-MS-ziL"
>
<rect
key=
"frame"
x=
"116"
y=
"
96
"
width=
"249"
height=
"80"
/>
<rect
key=
"frame"
x=
"116"
y=
"
113
"
width=
"249"
height=
"80"
/>
<subviews>
<subviews>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"383-j9-XU4"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"383-j9-XU4"
>
<rect
key=
"frame"
x=
"0.0"
y=
"20"
width=
"150"
height=
"21"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"20"
width=
"150"
height=
"21"
/>
...
@@ -87,7 +89,7 @@
...
@@ -87,7 +89,7 @@
<constraint
firstItem=
"8Ve-aK-QjO"
firstAttribute=
"leading"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"leading"
constant=
"21"
id=
"0Ps-3e-BIL"
/>
<constraint
firstItem=
"8Ve-aK-QjO"
firstAttribute=
"leading"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"leading"
constant=
"21"
id=
"0Ps-3e-BIL"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"Dmk-Ex-6bG"
secondAttribute=
"bottom"
id=
"Dc2-LQ-B8S"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"Dmk-Ex-6bG"
secondAttribute=
"bottom"
id=
"Dc2-LQ-B8S"
/>
<constraint
firstItem=
"Dmk-Ex-6bG"
firstAttribute=
"leading"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"leading"
id=
"Ps6-Pm-5j9"
/>
<constraint
firstItem=
"Dmk-Ex-6bG"
firstAttribute=
"leading"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"leading"
id=
"Ps6-Pm-5j9"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"8Ve-aK-QjO"
secondAttribute=
"bottom"
constant=
"
37
"
id=
"S40-nA-cbW"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"8Ve-aK-QjO"
secondAttribute=
"bottom"
constant=
"
20
"
id=
"S40-nA-cbW"
/>
<constraint
firstItem=
"Dmk-Ex-6bG"
firstAttribute=
"top"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"top"
id=
"VDD-7C-cHU"
/>
<constraint
firstItem=
"Dmk-Ex-6bG"
firstAttribute=
"top"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"top"
id=
"VDD-7C-cHU"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"Dmk-Ex-6bG"
secondAttribute=
"trailing"
id=
"akT-j3-3Qp"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"Dmk-Ex-6bG"
secondAttribute=
"trailing"
id=
"akT-j3-3Qp"
/>
<constraint
firstItem=
"X6K-MS-ziL"
firstAttribute=
"centerY"
secondItem=
"8Ve-aK-QjO"
secondAttribute=
"centerY"
id=
"d8U-u0-bn3"
/>
<constraint
firstItem=
"X6K-MS-ziL"
firstAttribute=
"centerY"
secondItem=
"8Ve-aK-QjO"
secondAttribute=
"centerY"
id=
"d8U-u0-bn3"
/>
...
@@ -116,12 +118,12 @@
...
@@ -116,12 +118,12 @@
<constraint
firstItem=
"wRZ-Pu-923"
firstAttribute=
"leading"
secondItem=
"i5M-Pr-FkT"
secondAttribute=
"leading"
id=
"o8g-Sj-rej"
/>
<constraint
firstItem=
"wRZ-Pu-923"
firstAttribute=
"leading"
secondItem=
"i5M-Pr-FkT"
secondAttribute=
"leading"
id=
"o8g-Sj-rej"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"trailing"
id=
"x9x-Yn-cXh"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"wRZ-Pu-923"
secondAttribute=
"trailing"
id=
"x9x-Yn-cXh"
/>
</constraints>
</constraints>
<point
key=
"canvasLocation"
x=
"-
1980"
y=
"-95
"
/>
<point
key=
"canvasLocation"
x=
"-
2145"
y=
"-167
"
/>
</view>
</view>
</objects>
</objects>
<resources>
<resources>
<image
name=
"Head-portrait"
width=
"161"
height=
"161"
/>
<image
name=
"Head-portrait"
width=
"161"
height=
"161"
/>
<image
name=
"
mineNavBg"
width=
"380"
height=
"214
"
/>
<image
name=
"
bg_ami_card"
width=
"375"
height=
"371
"
/>
<image
name=
"个人返回-1"
width=
"58"
height=
"58"
/>
<image
name=
"个人返回-1"
width=
"58"
height=
"58"
/>
</resources>
</resources>
</document>
</document>
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
View file @
4f142d2e
//
//
...
@@ -164,4 +164,7 @@ typedef void(^checkIsOldCustomer)(BOOL isOld);
...
@@ -164,4 +164,7 @@ typedef void(^checkIsOldCustomer)(BOOL isOld);
+
(
void
)
loadDataByUrl
:(
NSString
*
)
url
completed
:
(
RSCompletedBlock
)
completedBlock
;
+
(
void
)
loadDataByUrl
:(
NSString
*
)
url
completed
:
(
RSCompletedBlock
)
completedBlock
;
//公共头
//公共头
+
(
NSString
*
)
returnNormalHTTPHeaderJson
;
+
(
NSString
*
)
returnNormalHTTPHeaderJson
;
+
(
NSString
*
)
formatJumpUrl
:(
NSString
*
)
jumpUrl
;
@end
@end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
View file @
4f142d2e
//
//
...
@@ -1704,4 +1704,13 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
...
@@ -1704,4 +1704,13 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
}
onFinished
:^
(
id
responseObject
,
NSError
*
error
)
{
}
onFinished
:^
(
id
responseObject
,
NSError
*
error
)
{
}];
}];
}
}
#pragma mark - 通配符字符串
+
(
NSString
*
)
formatJumpUrl
:
(
NSString
*
)
jumpUrl
{
ASIdentifierManager
*
asIM
=
[[
ASIdentifierManager
alloc
]
init
];
NSString
*
idfa
=
[
asIM
.
advertisingIdentifier
UUIDString
];
NSString
*
j_url
=
[[[[[[[
jumpUrl
stringByReplacingOccurrencesOfString
:
@"${schoolid}"
withString
:
CacheCampusId
?
CacheCampusId
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${userid}"
withString
:
CacheUserId
?
CacheUserId
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${im}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${ia}"
withString
:
idfa
?
idfa
:
@""
]
stringByReplacingOccurrencesOfString
:
@"${imMD5}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${androidId}"
withString
:
@"none"
]
stringByReplacingOccurrencesOfString
:
@"${versionid}"
withString
:
APPversion
?
APPversion
:
@""
];
return
j_url
;
}
@end
@end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXUMStatisticsManager.h
0 → 100644
View file @
4f142d2e
//
//
// ZXUMStatisticsManager.h
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/9/6.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface
ZXUMStatisticsManager
:
NSObject
//配置友盟
+
(
void
)
configUMStatistics
;
//统计开屏广告点击
+
(
void
)
statisticsLauchAdClickByAdId
:(
NSInteger
)
adId
source
:
(
NSInteger
)
source
;
//统计开屏广告曝光
+
(
void
)
statisticsLauchAdExposeByAdId
:(
NSInteger
)
adId
source
:
(
NSInteger
)
source
;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXUMStatisticsManager.m
0 → 100644
View file @
4f142d2e
//
//
// ZXUMStatisticsManager.m
// ColorfulSchool
//
// Created by 刘卓鑫 on 2019/9/6.
// Copyright © 2019 Colorful Any Door. All rights reserved.
//
#import "ZXUMStatisticsManager.h"
#import <UMCommon/UMCommon.h>
#import <UMAnalytics/MobClick.h>
#import <UMCommonLog/UMCommonLogManager.h>
@implementation
ZXUMStatisticsManager
//友盟统计
+
(
void
)
configUMStatistics
{
//友盟统计
[
UMConfigure
initWithAppkey
:
@"5d71c1514ca3579831000c32"
channel
:
@"App Store"
];
[
UMCommonLogManager
setUpUMCommonLogManager
];
[
UMConfigure
setLogEnabled
:
YES
];
[
MobClick
setScenarioType
:
E_UM_NORMAL
];
//普通统计
[
MobClick
setCrashReportEnabled
:
NO
];
//关闭异常统计
}
//统计开屏广告点击
+
(
void
)
statisticsLauchAdClickByAdId
:
(
NSInteger
)
adId
source
:
(
NSInteger
)
source
{
[
MobClick
event
:
@"SplashActivity_IOS"
attributes
:@{
@"lauch_id"
:
@
(
adId
),
@"platformSource"
:
@
(
1
)}];
}
//统计开屏广告曝光
+
(
void
)
statisticsLauchAdExposeByAdId
:
(
NSInteger
)
adId
source
:
(
NSInteger
)
source
{
[
MobClick
event
:
@"SplashActivity_IOS_Expose"
attributes
:@{
@"lauch_id"
:
@
(
adId
),
@"platformSource"
:
@
(
1
)}];
}
@end
ColorfulSchool/ColorfulSchool/PrefixHeader.pch
View file @
4f142d2e
...
@@ -52,6 +52,8 @@
...
@@ -52,6 +52,8 @@
#import <MJExtension.h>
#import <MJExtension.h>
#import "ZXCustomAdView.h"
#import "ZXCustomAdView.h"
#import "ZXScannerViewController.h"
#import "ZXScannerViewController.h"
#import "ZXUMStatisticsManager.h"
#define APPversion [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"]
#define APPversion [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"]
#define kWidth [UIScreen mainScreen].bounds.size.width //屏幕宽度
#define kWidth [UIScreen mainScreen].bounds.size.width //屏幕宽度
...
...
ColorfulSchool/Podfile
View file @
4f142d2e
...
@@ -19,5 +19,8 @@ target 'ColorfulSchool' do
...
@@ -19,5 +19,8 @@ target 'ColorfulSchool' do
pod
'GDTMobSDK'
,
'~> 4.10.5'
pod
'GDTMobSDK'
,
'~> 4.10.5'
pod
'JJException'
pod
'JJException'
pod
'Bugly'
pod
'Bugly'
pod
'UMCAnalytics'
pod
'UMCCommon'
pod
'UMCCommonLog'
end
end
ColorfulSchool/Podfile.lock
View file @
4f142d2e
...
@@ -84,6 +84,10 @@ PODS:
...
@@ -84,6 +84,10 @@ PODS:
- SDWebImage/Core (= 3.8.3)
- SDWebImage/Core (= 3.8.3)
- SDWebImage/Core (3.8.3)
- SDWebImage/Core (3.8.3)
- SVProgressHUD (2.2.5)
- SVProgressHUD (2.2.5)
- UMCAnalytics (6.0.5):
- UMCCommon
- UMCCommon (2.1.1)
- UMCCommonLog (1.0.0)
- XRCarouselView (2.6.1)
- XRCarouselView (2.6.1)
DEPENDENCIES:
DEPENDENCIES:
...
@@ -103,6 +107,9 @@ DEPENDENCIES:
...
@@ -103,6 +107,9 @@ DEPENDENCIES:
- ReactiveCocoa (from `https://github.com/zhao0/ReactiveCocoa.git`, tag `2.5.2`)
- ReactiveCocoa (from `https://github.com/zhao0/ReactiveCocoa.git`, tag `2.5.2`)
- SDWebImage (~> 3.8)
- SDWebImage (~> 3.8)
- SVProgressHUD
- SVProgressHUD
- UMCAnalytics
- UMCCommon
- UMCCommonLog
- XRCarouselView
- XRCarouselView
SPEC REPOS:
SPEC REPOS:
...
@@ -125,6 +132,9 @@ SPEC REPOS:
...
@@ -125,6 +132,9 @@ SPEC REPOS:
- Qiniu
- Qiniu
- SDWebImage
- SDWebImage
- SVProgressHUD
- SVProgressHUD
- UMCAnalytics
- UMCCommon
- UMCCommonLog
- XRCarouselView
- XRCarouselView
EXTERNAL SOURCES:
EXTERNAL SOURCES:
...
@@ -157,8 +167,11 @@ SPEC CHECKSUMS:
...
@@ -157,8 +167,11 @@ SPEC CHECKSUMS:
ReactiveCocoa: 3ff25b1bd992ac79c5c79b26b6c0c1713b715bb2
ReactiveCocoa: 3ff25b1bd992ac79c5c79b26b6c0c1713b715bb2
SDWebImage: a72e880a8fe0f7fc31efe15aaed443c074d2a80c
SDWebImage: a72e880a8fe0f7fc31efe15aaed443c074d2a80c
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
UMCAnalytics: 045be2cd1ec05aa95ad62405a850757f932e2d59
UMCCommon: 971f324a5a99c9d662ae040a815e7e3d7ef8b2a8
UMCCommonLog: 05a2d5de21858e3d870551562cff405c1366d244
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM:
3a8bfba3bf95c1db909001d7cff56024a71a4e23
PODFILE CHECKSUM:
527f66859bae02783d9a05af259e5ace5b8cf77b
COCOAPODS: 1.7.5
COCOAPODS: 1.7.5
ColorfulSchool/Pods/Manifest.lock
View file @
4f142d2e
...
@@ -84,6 +84,10 @@ PODS:
...
@@ -84,6 +84,10 @@ PODS:
- SDWebImage/Core (= 3.8.3)
- SDWebImage/Core (= 3.8.3)
- SDWebImage/Core (3.8.3)
- SDWebImage/Core (3.8.3)
- SVProgressHUD (2.2.5)
- SVProgressHUD (2.2.5)
- UMCAnalytics (6.0.5):
- UMCCommon
- UMCCommon (2.1.1)
- UMCCommonLog (1.0.0)
- XRCarouselView (2.6.1)
- XRCarouselView (2.6.1)
DEPENDENCIES:
DEPENDENCIES:
...
@@ -103,6 +107,9 @@ DEPENDENCIES:
...
@@ -103,6 +107,9 @@ DEPENDENCIES:
- ReactiveCocoa (from `https://github.com/zhao0/ReactiveCocoa.git`, tag `2.5.2`)
- ReactiveCocoa (from `https://github.com/zhao0/ReactiveCocoa.git`, tag `2.5.2`)
- SDWebImage (~> 3.8)
- SDWebImage (~> 3.8)
- SVProgressHUD
- SVProgressHUD
- UMCAnalytics
- UMCCommon
- UMCCommonLog
- XRCarouselView
- XRCarouselView
SPEC REPOS:
SPEC REPOS:
...
@@ -125,6 +132,9 @@ SPEC REPOS:
...
@@ -125,6 +132,9 @@ SPEC REPOS:
- Qiniu
- Qiniu
- SDWebImage
- SDWebImage
- SVProgressHUD
- SVProgressHUD
- UMCAnalytics
- UMCCommon
- UMCCommonLog
- XRCarouselView
- XRCarouselView
EXTERNAL SOURCES:
EXTERNAL SOURCES:
...
@@ -157,8 +167,11 @@ SPEC CHECKSUMS:
...
@@ -157,8 +167,11 @@ SPEC CHECKSUMS:
ReactiveCocoa: 3ff25b1bd992ac79c5c79b26b6c0c1713b715bb2
ReactiveCocoa: 3ff25b1bd992ac79c5c79b26b6c0c1713b715bb2
SDWebImage: a72e880a8fe0f7fc31efe15aaed443c074d2a80c
SDWebImage: a72e880a8fe0f7fc31efe15aaed443c074d2a80c
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
UMCAnalytics: 045be2cd1ec05aa95ad62405a850757f932e2d59
UMCCommon: 971f324a5a99c9d662ae040a815e7e3d7ef8b2a8
UMCCommonLog: 05a2d5de21858e3d870551562cff405c1366d244
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM:
3a8bfba3bf95c1db909001d7cff56024a71a4e23
PODFILE CHECKSUM:
527f66859bae02783d9a05af259e5ace5b8cf77b
COCOAPODS: 1.7.5
COCOAPODS: 1.7.5
ColorfulSchool/Pods/Pods.xcodeproj/project.pbxproj
View file @
4f142d2e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
4f142d2e
...
@@ -109,6 +109,21 @@
...
@@ -109,6 +109,21 @@
<
k
e
y
>
isShown
<
/k
e
y
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
fa
ls
e
/
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
k
e
y
>
UMCAnalytics.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
/
d
i
c
t
>
<
k
e
y
>
UMCCommon.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
/
d
i
c
t
>
<
k
e
y
>
UMCCommonLog.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
/
d
i
c
t
>
<
k
e
y
>
XRCarouselView.xcscheme
<
/k
e
y
>
<
k
e
y
>
XRCarouselView.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
k
e
y
>
isShown
<
/k
e
y
>
...
...
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool-acknowledgements.markdown
View file @
4f142d2e
...
@@ -389,6 +389,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
...
@@ -389,6 +389,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
## UMCAnalytics
Copyright 2011 - 2019 umeng.com. All rights reserved.
## UMCCommon
Copyright 2011 - 2019 umeng.com. All rights reserved.
## UMCCommonLog
Copyright 2011 - 2018 umeng.com. All rights reserved.
## XRCarouselView
## XRCarouselView
The MIT License (MIT)
The MIT License (MIT)
...
...
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool-acknowledgements.plist
View file @
4f142d2e
...
@@ -516,6 +516,39 @@ SOFTWARE.
...
@@ -516,6 +516,39 @@ SOFTWARE.
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
FooterText
<
/k
e
y
>
<
k
e
y
>
FooterText
<
/k
e
y
>
<
string
>
Copyright
2011
-
2019
umeng.com.
All
rights
reserved.
<
/string
>
<
k
e
y
>
License
<
/k
e
y
>
<
string
>
Copyright
<
/string
>
<
k
e
y
>
Title
<
/k
e
y
>
<
string
>
UMCAnalytics
<
/string
>
<
k
e
y
>
Type
<
/k
e
y
>
<
string
>
PSGroupSpecifier
<
/string
>
<
/
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
FooterText
<
/k
e
y
>
<
string
>
Copyright
2011
-
2019
umeng.com.
All
rights
reserved.
<
/string
>
<
k
e
y
>
License
<
/k
e
y
>
<
string
>
Copyright
<
/string
>
<
k
e
y
>
Title
<
/k
e
y
>
<
string
>
UMCCommon
<
/string
>
<
k
e
y
>
Type
<
/k
e
y
>
<
string
>
PSGroupSpecifier
<
/string
>
<
/
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
FooterText
<
/k
e
y
>
<
string
>
Copyright
2011
-
2018
umeng.com.
All
rights
reserved.
<
/string
>
<
k
e
y
>
License
<
/k
e
y
>
<
string
>
Copyright
<
/string
>
<
k
e
y
>
Title
<
/k
e
y
>
<
string
>
UMCCommonLog
<
/string
>
<
k
e
y
>
Type
<
/k
e
y
>
<
string
>
PSGroupSpecifier
<
/string
>
<
/
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
FooterText
<
/k
e
y
>
<
string
>
The
MIT
License
(
MIT
)
<
string
>
The
MIT
License
(
MIT
)
Copyright
(
c
)
2016
codingZero
Copyright
(
c
)
2016
codingZero
...
...
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool-resources.sh
View file @
4f142d2e
...
@@ -101,6 +101,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
...
@@ -101,6 +101,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
install_resource
"
${
PODS_ROOT
}
/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
install_resource
"
${
PODS_ROOT
}
/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
install_resource
"
${
PODS_ROOT
}
/MJRefresh/MJRefresh/MJRefresh.bundle"
install_resource
"
${
PODS_ROOT
}
/MJRefresh/MJRefresh/MJRefresh.bundle"
install_resource
"
${
PODS_ROOT
}
/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
install_resource
"
${
PODS_ROOT
}
/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
install_resource
"
${
PODS_ROOT
}
/UMCCommonLog/UMCommonLog/UMCommonLog.bundle"
install_resource
"
${
PODS_ROOT
}
/XRCarouselView/XRCarouselView/XRPlaceholder.png"
install_resource
"
${
PODS_ROOT
}
/XRCarouselView/XRCarouselView/XRPlaceholder.png"
fi
fi
if
[[
"
$CONFIGURATION
"
==
"Release"
]]
;
then
if
[[
"
$CONFIGURATION
"
==
"Release"
]]
;
then
...
@@ -108,6 +109,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
...
@@ -108,6 +109,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
install_resource
"
${
PODS_ROOT
}
/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
install_resource
"
${
PODS_ROOT
}
/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
install_resource
"
${
PODS_ROOT
}
/MJRefresh/MJRefresh/MJRefresh.bundle"
install_resource
"
${
PODS_ROOT
}
/MJRefresh/MJRefresh/MJRefresh.bundle"
install_resource
"
${
PODS_ROOT
}
/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
install_resource
"
${
PODS_ROOT
}
/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
install_resource
"
${
PODS_ROOT
}
/UMCCommonLog/UMCommonLog/UMCommonLog.bundle"
install_resource
"
${
PODS_ROOT
}
/XRCarouselView/XRCarouselView/XRPlaceholder.png"
install_resource
"
${
PODS_ROOT
}
/XRCarouselView/XRCarouselView/XRPlaceholder.png"
fi
fi
if
[[
"
$CONFIGURATION
"
==
"adhot"
]]
;
then
if
[[
"
$CONFIGURATION
"
==
"adhot"
]]
;
then
...
@@ -115,6 +117,7 @@ if [[ "$CONFIGURATION" == "adhot" ]]; then
...
@@ -115,6 +117,7 @@ if [[ "$CONFIGURATION" == "adhot" ]]; then
install_resource
"
${
PODS_ROOT
}
/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
install_resource
"
${
PODS_ROOT
}
/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle"
install_resource
"
${
PODS_ROOT
}
/MJRefresh/MJRefresh/MJRefresh.bundle"
install_resource
"
${
PODS_ROOT
}
/MJRefresh/MJRefresh/MJRefresh.bundle"
install_resource
"
${
PODS_ROOT
}
/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
install_resource
"
${
PODS_ROOT
}
/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle"
install_resource
"
${
PODS_ROOT
}
/UMCCommonLog/UMCommonLog/UMCommonLog.bundle"
install_resource
"
${
PODS_ROOT
}
/XRCarouselView/XRCarouselView/XRPlaceholder.png"
install_resource
"
${
PODS_ROOT
}
/XRCarouselView/XRCarouselView/XRPlaceholder.png"
fi
fi
...
...
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.adhot.xcconfig
View file @
4f142d2e
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
"${PODS_ROOT}/UMCAnalytics" "${PODS_ROOT}/UMCCommon" "${PODS_ROOT}/UMCCommonLog/UMCommonLog"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
-iframework "${PODS_ROOT}/UMCAnalytics" -iframework "${PODS_ROOT}/UMCCommon" -iframework "${PODS_ROOT}/UMCCommonLog/UMCommonLog"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -
framework "UMAnalytics" -framework "UMCommon" -framework "UMCommonLog" -
weak_framework "UserNotifications" -weak_framework "WebKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
...
...
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.debug.xcconfig
View file @
4f142d2e
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
"${PODS_ROOT}/UMCAnalytics" "${PODS_ROOT}/UMCCommon" "${PODS_ROOT}/UMCCommonLog/UMCommonLog"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
-iframework "${PODS_ROOT}/UMCAnalytics" -iframework "${PODS_ROOT}/UMCCommon" -iframework "${PODS_ROOT}/UMCCommonLog/UMCommonLog"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -
framework "UMAnalytics" -framework "UMCommon" -framework "UMCommonLog" -
weak_framework "UserNotifications" -weak_framework "WebKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
...
...
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.release.xcconfig
View file @
4f142d2e
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
"${PODS_ROOT}/UMCAnalytics" "${PODS_ROOT}/UMCCommon" "${PODS_ROOT}/UMCCommonLog/UMCommonLog"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
-iframework "${PODS_ROOT}/UMCAnalytics" -iframework "${PODS_ROOT}/UMCCommon" -iframework "${PODS_ROOT}/UMCCommonLog/UMCommonLog"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -
framework "UMAnalytics" -framework "UMCommon" -framework "UMCommonLog" -
weak_framework "UserNotifications" -weak_framework "WebKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment