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
88ce3fd0
Commit
88ce3fd0
authored
Apr 29, 2019
by
刘卓鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构版本bug修改
parent
974f9197
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
257 additions
and
83 deletions
+257
-83
ColorfulSchool.xcscheme
....xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
+2
-0
xcschememanagement.plist
...erdata/rym.xcuserdatad/xcschemes/xcschememanagement.plist
+7
-0
UserInterfaceState.xcuserstate
...xcuserdata/rym.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
AppDelegate.m
ColorfulSchool/ColorfulSchool/AppDelegate.m
+20
-17
ZXRegistorViewController.m
...ogin(登录注册)/Register/Controller/ZXRegistorViewController.m
+5
-1
AimiWalletViewController.m
...ew(个人中心)/AimiWallet/Controller/AimiWalletViewController.m
+11
-3
ZXSettingViewController.m
.../UserSetting/UserSet/Controller/ZXSettingViewController.m
+91
-33
ZTHomeViewController.m
...ses/NewFirstPage(新版首页)/Controllers/ZTHomeViewController.m
+2
-4
GetData.m
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/GetData.m
+2
-2
ZXTool.h
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
+2
-2
ZXTool.m
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
+7
-3
ZXNewConfirmPayViewController.h
...s/YWTPay(新版支付)/Controller/ZXNewConfirmPayViewController.h
+3
-1
ZXNewConfirmPayViewController.m
...s/YWTPay(新版支付)/Controller/ZXNewConfirmPayViewController.m
+4
-10
ZXOrderPayController.m
...ol/Classes/YWTPay(新版支付)/Controller/ZXOrderPayController.m
+12
-5
ZXYWTPayViewController.m
.../Classes/YWTPay(新版支付)/Controller/ZXYWTPayViewController.m
+8
-2
xcschememanagement.plist
...erdata/rym.xcuserdatad/xcschemes/xcschememanagement.plist
+81
-0
No files found.
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
View file @
88ce3fd0
...
...
@@ -26,6 +26,7 @@
buildConfiguration =
"Debug"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
language =
""
shouldUseLaunchSchemeArgsEnv =
"YES"
>
<Testables>
<TestableReference
...
...
@@ -65,6 +66,7 @@
buildConfiguration =
"Debug"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
language =
""
launchStyle =
"0"
useCustomWorkingDirectory =
"NO"
ignoresPersistentStateOnLaunch =
"NO"
...
...
ColorfulSchool/ColorfulSchool.xcodeproj/xcuserdata/rym.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
88ce3fd0
...
...
@@ -6,9 +6,16 @@
<
d
i
c
t
>
<
k
e
y
>
ColorfulSchool.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
0
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
ColorfulSchool.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
2
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
k
e
y
>
SuppressBuildableAutocreation
<
/k
e
y
>
<
d
i
c
t
>
...
...
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/rym.xcuserdatad/UserInterfaceState.xcuserstate
View file @
88ce3fd0
No preview for this file type
ColorfulSchool/ColorfulSchool/AppDelegate.m
View file @
88ce3fd0
...
...
@@ -68,13 +68,10 @@
//防止crash
[
JJException
configExceptionCategory
:
JJExceptionGuardAll
];
[
JJException
startGuardException
];
//极光推送
[
self
initPushWithOptions
:
launchOptions
isProduct
:
kJPushIsProduct
];
//网络监测
[
self
checkNetworkingStatus
];
//获取外网ip
[
self
deviceWANIPAdress
];
//异常捕获
...
...
@@ -83,9 +80,8 @@
[
self
createWindow
];
//token登录
[
self
tokenLogin
];
//每次启动获取一次用户信息
[
ZXTool
fetchUserInfo
];
//请求最新的是否需要曝光配置
[
ZXTool
requestIsNeedExposure
];
//创建开屏广告
//[[ZXTXAdTool sharedZXTXAdTool] createLauchAdByPlacmentId:kTXAdLauchPLACEMENTID];
return
YES
;
...
...
@@ -105,7 +101,6 @@
if
([
jump
isEqualToString
:
@"NONE"
])
{
//先读取缓存
NSArray
*
list
=
[
LoginJump
findAll
];
if
(
list
.
count
==
0
)
{
jump
=
@"DC_01"
;
...
...
@@ -144,10 +139,15 @@
}
-
(
void
)
applicationDidEnterBackground
:
(
UIApplication
*
)
application
{
if
([[
ZXTool
getCurrentVC
]
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[[
ZXTool
getCurrentVC
]
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)])
{
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kSelf_help_destory_timer
object
:
nil
];
@try
{
UIViewController
*
vc
=
[
ZXTool
getCurrentVC
];
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)])
{
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kSelf_help_destory_timer
object
:
nil
];
}
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
...
...
@@ -155,17 +155,20 @@
-
(
void
)
applicationWillEnterForeground
:
(
UIApplication
*
)
application
{
[
kUserDefaults
setObject
:[
ZXTool
getCurrentTimeStamp
]
forKey
:
@"uploadBatch"
];
//请求最新的是否需要曝光配置
[
ZXTool
requestIsNeedExposure
];
}
-
(
void
)
applicationDidBecomeActive
:
(
UIApplication
*
)
application
{
if
([[
ZXTool
getCurrentVC
]
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[[
ZXTool
getCurrentVC
]
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)])
{
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kSelf_help_start_timer
object
:
nil
];
@try
{
UIViewController
*
vc
=
[
ZXTool
getCurrentVC
];
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)])
{
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kSelf_help_start_timer
object
:
nil
];
}
}
@catch
(
NSException
*
exception
)
{
}
@finally
{
}
}
...
...
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXRegistorViewController.m
View file @
88ce3fd0
//
//
...
...
@@ -639,6 +639,10 @@
[
ZXTool
showText
:
@"请先阅读用户协议并同意"
];
return
;
}
if
(
self
.
currentSelecCampus
.
id
==
0
||
self
.
currentSelecCampus
.
areaName
==
nil
||
[
self
.
currentSelecCampus
.
areaName
isEqualToString
:
@""
])
{
[
ZXTool
showText
:
@"所选择区域id为0,请下拉刷新区域重新选择"
];
return
;
}
NSDictionary
*
dic
=
@{
@"customerName"
:
self
.
nameField
.
text
,
@"customerPhone"
:
self
.
phoneField
.
text
,
@"customerSex"
:
self
.
maleBtn
.
enabled
?
@"2"
:
@"1"
,
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.m
View file @
88ce3fd0
//
//
...
...
@@ -304,6 +304,9 @@ static NSString * const ID = @"CollectionCell";
confirmBtn
.
enabled
=
YES
;
self
.
navigationController
.
navigationBar
.
hidden
=
YES
;
[
self
registNotificationAndKVO
];
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
2
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
[
ZXTool
hideLoadingAnimation
];
});
}
-
(
void
)
viewWillDisappear
:
(
BOOL
)
animated
{
[
super
viewWillDisappear
:
animated
];
...
...
@@ -549,8 +552,13 @@ heightForFooterInSection:(NSInteger)section {
@weakify
(
self
);
confirmVc
.
payCompletedAction
=
^
{
@strongify
(
self
);
self
.
comeFrom
=
@""
;
[
self
refreshUserInfo
];
if
([
self
.
comeFrom
isEqualToString
:
@"firstTopUp"
])
{
self
.
comeFrom
=
@""
;
[
self
checkWalletData
];
}
else
{
self
.
comeFrom
=
@""
;
[
self
refreshUserInfo
];
}
};
[
self
.
navigationController
pushViewController
:
confirmVc
animated
:
YES
];
}
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/UserSet/Controller/ZXSettingViewController.m
View file @
88ce3fd0
//
//
...
...
@@ -39,12 +39,27 @@ typedef void(^isCanChange)(BOOL iCan);
[
self
.
view
addSubview
:
self
.
myTableView
];
[
ZXTool
checkCurrentUserModeCompleted
:
^
(
BOOL
isOld
)
{
[
self
operationSection1
:
isOld
];
if
(
isOld
==
NO
)
{
[
ZXTool
requestDataWithType
:
kXMHTTPMethodGET
url
:[
NSString
stringWithFormat
:
@"%@/dcxy/hardware/info/forcustomer/loginState?customerId=%@"
,
[
kUserDefaults
objectForKey
:
@"NEW_PAY"
],
CacheUserId
]
para
:
nil
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
[
ZXTool
hideLoadingAnimation
];
if
(
error
)
{
[
ZXTool
showText
:
error
];
[
kUserDefaults
setObject
:
@"notShow"
forKey
:
@"devPassSwitch"
];
}
else
{
[
kUserDefaults
setObject
:
common
.
data
forKey
:
@"devPassSwitch"
];
}
[
self
operationSection1
:
isOld
];
});
}];
if
([[
kUserDefaults
valueForKey
:
kAPP_IS_OPEN_JK
]
isEqualToString
:
@"yes"
]
&&
([
CacheVersion
isEqualToString
:
@"2.0"
]
||
[
CacheVersion
isEqualToString
:
@"2"
]))
{
[
self
loadIsOpenFreePay
];
[
self
checkCurrentUserIsOpenJPush
];
}
}
else
{
[
self
operationSection1
:
isOld
];
}
}];
...
...
@@ -95,36 +110,65 @@ typedef void(^isCanChange)(BOOL iCan);
}
}
else
{
if
([
CacheVersion
isEqualToString
:
@"2.0"
]
||
[
CacheVersion
isEqualToString
:
@"2"
])
{
NSArray
*
group1
=
@[
@"app登录密码"
,
@"设备密码"
,
@"更换手机账户"
,
@"开启设备登录密码"
,
@"开启系统自动扣费"
,
@"开启订单推送"
];
NSArray
*
imagegroup1
=
@[
@"Passwordtwo.png"
,
@"设备.png"
,
@"app.png"
,
@"set_bar_code"
,
@"icon_mianmi"
,
@"icon-push"
];
ZXUserSettingModel
*
m1
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m2
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m3
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m4
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m5
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m6
=
[[
ZXUserSettingModel
alloc
]
init
];
m1
.
imageName
=
imagegroup1
[
0
];
m1
.
name
=
group1
[
0
];
m2
.
imageName
=
imagegroup1
[
1
];
m2
.
name
=
group1
[
1
];
m3
.
imageName
=
imagegroup1
[
2
];
m3
.
name
=
group1
[
2
];
m4
.
imageName
=
imagegroup1
[
3
];
m4
.
name
=
group1
[
3
];
m4
.
isHasSwitch
=
YES
;
m4
.
switchIsOn
=
[
CacheDevPassSwitch
integerValue
];
m5
.
imageName
=
imagegroup1
[
4
];
m5
.
name
=
group1
[
4
];
m5
.
isHasSwitch
=
YES
;
m5
.
switchIsOn
=
NO
;
m6
.
imageName
=
imagegroup1
[
5
];
m6
.
name
=
group1
[
5
];
m6
.
isHasSwitch
=
YES
;
m6
.
switchIsOn
=
NO
;
m4
.
switchType
=
1
;
m5
.
switchType
=
2
;
m6
.
switchType
=
3
;
[
self
.
sections1
addObjectsFromArray
:@[
m1
,
m2
,
m3
,
m4
,
m5
,
m6
]];
if
([[
kUserDefaults
valueForKey
:
kAPP_IS_OPEN_JK
]
isEqualToString
:
@"yes"
])
{
NSArray
*
group1
=
@[
@"app登录密码"
,
@"设备密码"
,
@"更换手机账户"
,
@"开启设备登录密码"
,
@"开启系统自动扣费"
,
@"开启订单推送"
];
NSArray
*
imagegroup1
=
@[
@"Passwordtwo.png"
,
@"设备.png"
,
@"app.png"
,
@"set_bar_code"
,
@"icon_mianmi"
,
@"icon-push"
];
ZXUserSettingModel
*
m1
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m2
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m3
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m4
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m5
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m6
=
[[
ZXUserSettingModel
alloc
]
init
];
m1
.
imageName
=
imagegroup1
[
0
];
m1
.
name
=
group1
[
0
];
m2
.
imageName
=
imagegroup1
[
1
];
m2
.
name
=
group1
[
1
];
m3
.
imageName
=
imagegroup1
[
2
];
m3
.
name
=
group1
[
2
];
m4
.
imageName
=
imagegroup1
[
3
];
m4
.
name
=
group1
[
3
];
m4
.
isHasSwitch
=
YES
;
m4
.
switchIsOn
=
[
CacheDevPassSwitch
integerValue
];
m5
.
imageName
=
imagegroup1
[
4
];
m5
.
name
=
group1
[
4
];
m5
.
isHasSwitch
=
YES
;
m5
.
switchIsOn
=
NO
;
m6
.
imageName
=
imagegroup1
[
5
];
m6
.
name
=
group1
[
5
];
m6
.
isHasSwitch
=
YES
;
m6
.
switchIsOn
=
NO
;
m4
.
switchType
=
1
;
m5
.
switchType
=
2
;
m6
.
switchType
=
3
;
if
([
CacheDevPassSwitch
isEqualToString
:
@"notShow"
])
{
[
self
.
sections1
addObjectsFromArray
:@[
m1
,
m2
,
m3
,
m5
,
m6
]];
}
else
{
[
self
.
sections1
addObjectsFromArray
:@[
m1
,
m2
,
m3
,
m4
,
m5
,
m6
]];
}
}
else
{
NSArray
*
group1
=
@[
@"app登录密码"
,
@"设备密码"
,
@"更换手机账户"
,
@"开启设备登录密码"
];
NSArray
*
imagegroup1
=
@[
@"Passwordtwo.png"
,
@"设备.png"
,
@"app.png"
,
@"set_bar_code"
];
ZXUserSettingModel
*
m1
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m2
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m3
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m4
=
[[
ZXUserSettingModel
alloc
]
init
];
m1
.
imageName
=
imagegroup1
[
0
];
m1
.
name
=
group1
[
0
];
m2
.
imageName
=
imagegroup1
[
1
];
m2
.
name
=
group1
[
1
];
m3
.
imageName
=
imagegroup1
[
2
];
m3
.
name
=
group1
[
2
];
m4
.
imageName
=
imagegroup1
[
3
];
m4
.
name
=
group1
[
3
];
m4
.
isHasSwitch
=
YES
;
m4
.
switchIsOn
=
[
CacheDevPassSwitch
integerValue
];
m4
.
switchType
=
1
;
if
([
CacheDevPassSwitch
isEqualToString
:
@"notShow"
])
{
[
self
.
sections1
addObjectsFromArray
:@[
m1
,
m2
,
m3
]];
}
else
{
[
self
.
sections1
addObjectsFromArray
:@[
m1
,
m2
,
m3
,
m4
]];
}
}
}
else
{
ZXUserSettingModel
*
m1
=
[[
ZXUserSettingModel
alloc
]
init
];
ZXUserSettingModel
*
m2
=
[[
ZXUserSettingModel
alloc
]
init
];
...
...
@@ -210,7 +254,21 @@ typedef void(^isCanChange)(BOOL iCan);
@strongify
(
self
);
switch
(
switchType
)
{
case
1
:
{
[[
AllowEequipCountLoginModel
new
]
AllowEquitLoginWithStatu
:
m
.
switchIsOn
?
@"0"
:
@"1"
];
[
ZXTool
checkCurrentUserModeCompleted
:
^
(
BOOL
isOld
)
{
if
(
isOld
)
{
[[
AllowEequipCountLoginModel
new
]
AllowEquitLoginWithStatu
:
m
.
switchIsOn
?
@"0"
:
@"1"
];
}
else
{
[
ZXTool
requestDataWithType
:
kXMHTTPMethodPOST
url
:[
NSString
stringWithFormat
:
@"%@/dcxy/hardware/change/state?customerId=%@&loginState=%d"
,
[
kUserDefaults
objectForKey
:
@"NEW_PAY"
],
CacheUserId
,
m
.
switchIsOn
]
para
:
@{
@"customerId"
:
CacheUserId
,
@"loginState"
:
m
.
switchIsOn
?
@"1"
:
@"0"
}
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
[
ZXTool
hideLoadingAnimation
];
if
(
error
)
{
[
ZXTool
showText
:
error
];
m
.
switchIsOn
=
!
m
.
switchIsOn
;
}
});
}];
}
}];
break
;
}
case
2
:
{
...
...
ColorfulSchool/ColorfulSchool/Classes/NewFirstPage(新版首页)/Controllers/ZTHomeViewController.m
View file @
88ce3fd0
//
//
...
...
@@ -118,7 +118,6 @@ static NSInteger seq = 0;
[
ZXTool
loadAdInfoByAdId
:
@"1"
topView
:
nil
superView
:
self
.
view
fromVc
:
self
];
});
//老版本部分内容
self
.
firstTopupModel
=
[
JudgeFirstTopUpModel
new
];
self
.
updateModel
=
[
CampasVersionUpdateModel
new
];
//注册观察者
...
...
@@ -127,8 +126,7 @@ static NSInteger seq = 0;
//版本检测
[
self
.
updateModel
CampasVersionUpdateWithCurrentVersion
:
APPversion
];
}
...
...
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/GetData.m
View file @
88ce3fd0
//
//
...
...
@@ -1209,7 +1209,7 @@ static GetData *_instance;
NSDictionary
*
dataDic
=
[[
NSDictionary
alloc
]
initWithObjectsAndKeys
:
userId
,
@"userId"
,
statu
,
@"status"
,
nil
];
NSString
*
json
=
[
self
dictionaryToJson
:
dataDic
];
NSString
*
postStr
=
[
NSString
stringWithFormat
:
@"%@%@%@"
,
@"dc2017"
,
@"MT_MOB_00035"
,
json
];
NSString
*
md5Str
=
[
self
md5
:
postStr
];
NSString
*
md5Str
=
[
self
md5
:
postStr
];
NSString
*
dicstr
=
[
self
dictionaryToJson
:
dataDic
];
NSString
*
token
=
CacheToken
;
if
(
token
==
nil
)
{
...
...
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
View file @
88ce3fd0
//
//
...
...
@@ -171,7 +171,7 @@ typedef void(^checkIsOldCustomer)(BOOL isOld);
/*获取用户信息*/
+
(
void
)
fetchUserInfo
;
//
+(void) fetchUserInfo;
/*获取用户信息*/
+
(
void
)
fetchUserInfoCompleted
:(
checkIsOldCustomer
)
completed
;
+
(
void
)
saveUserInfo
:(
ZXUserModel
*
)
user
;
...
...
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
View file @
88ce3fd0
//
//
...
...
@@ -1935,9 +1935,13 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
[
ZXTool
checkCurrentUserModeCompleted
:
^
(
BOOL
isOld
)
{
@strongify
(
self
);
if
(
isOld
)
{
[
self
fetchUserCenterDataCompleted
:
nil
];
[
self
fetchUserCenterDataCompleted
:
^
(
BOOL
isOld
)
{
}];
}
else
{
[
self
refreshUserInfoCompleted
:
nil
];
[
self
refreshUserInfoCompleted
:
^
(
BOOL
isOld
)
{
}];
}
}];
});
...
...
ColorfulSchool/ColorfulSchool/Classes/YWTPay(新版支付)/Controller/ZXNewConfirmPayViewController.h
View file @
88ce3fd0
//
//
...
...
@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
@property
(
nonatomic
,
strong
)
ZXNewPayOrder
*
order
;
@property
(
nonatomic
,
strong
)
ZXNewPayTypeModel
*
payType
;
@property
(
nonatomic
,
copy
)
dispatch_block_t
paySuccess
;
@property
(
nonatomic
,
copy
)
dispatch_block_t
backAction
;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/YWTPay(新版支付)/Controller/ZXNewConfirmPayViewController.m
View file @
88ce3fd0
//
//
...
...
@@ -208,15 +208,9 @@
self
.
paySuccess
();
}
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kOrder_Completed_Pay
object
:
nil
];
dispatch_async
(
dispatch_get_main_queue
(),
^
{
NSArray
*
controllers
=
self
.
navigationController
.
childViewControllers
;
NSArray
*
res
=
[[
controllers
reverseObjectEnumerator
]
allObjects
];
for
(
UIViewController
*
vc
in
res
)
{
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZTHomeViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXRSNewViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSimpleHomeController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXNewPayOrderListViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"UserSettingViewController"
)])
{
[
self
.
navigationController
popToViewController
:
vc
animated
:
YES
];
}
}
});
if
(
self
.
backAction
)
{
self
.
backAction
();
}
}
// 对JSON字符串进行urlEncode 处理
...
...
ColorfulSchool/ColorfulSchool/Classes/YWTPay(新版支付)/Controller/ZXOrderPayController.m
View file @
88ce3fd0
//
//
...
...
@@ -193,16 +193,18 @@
[[
back
rac_signalForControlEvents
:
UIControlEventTouchDown
]
subscribeNext
:
^
(
id
x
)
{
@strongify
(
self
);
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kOrder_CheckNopPay_Pay
object
:
nil
];
NSArray
*
controllers
=
self
.
navigationController
.
childViewControllers
;
NSArray
*
res
=
[[
controllers
reverseObjectEnumerator
]
allObjects
];
BOOL
isFound
=
NO
;
for
(
UIViewController
*
vc
in
self
.
navigationController
.
childViewController
s
)
{
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZTHomeViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXRSNewViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSimpleHomeController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXNewPayOrderListViewController"
)])
{
for
(
UIViewController
*
vc
in
re
s
)
{
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZTHomeViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXRSNewViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSimpleHomeController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXNewPayOrderListViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"UserSettingViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"MineViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXMallViewController"
)]
)
{
[
self
.
navigationController
popToViewController
:
vc
animated
:
YES
];
isFound
=
YES
;
break
;
}
}
if
(
isFound
)
{
[
self
.
navigationController
popViewControllerAnimated
:
YES
];
if
(
isFound
==
NO
)
{
[
self
.
navigationController
pop
ToRoot
ViewControllerAnimated
:
YES
];
}
}];
...
...
@@ -284,6 +286,11 @@
vc
.
order
=
self
.
order
;
vc
.
payType
=
self
.
currentPayType
;
vc
.
paySuccess
=
self
.
paySuccess
;
@weakify
(
self
);
vc
.
backAction
=
^
{
@strongify
(
self
);
[
self
.
navigationController
popToRootViewControllerAnimated
:
YES
];
};
[
self
.
navigationController
pushViewController
:
vc
animated
:
YES
];
}
-
(
NSInteger
)
tableView
:
(
UITableView
*
)
tableView
numberOfRowsInSection
:
(
NSInteger
)
section
{
...
...
ColorfulSchool/ColorfulSchool/Classes/YWTPay(新版支付)/Controller/ZXYWTPayViewController.m
View file @
88ce3fd0
//
//
...
...
@@ -75,11 +75,17 @@
dispatch_async
(
dispatch_get_main_queue
(),
^
{
NSArray
*
controllers
=
self
.
navigationController
.
childViewControllers
;
NSArray
*
res
=
[[
controllers
reverseObjectEnumerator
]
allObjects
];
BOOL
isFound
=
NO
;
for
(
UIViewController
*
vc
in
res
)
{
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZTHomeViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXRSNewViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSimpleHomeController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXNewPayOrderListViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)])
{
if
([
vc
isKindOfClass
:
NSClassFromString
(
@"ZTHomeViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXRSNewViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSimpleHomeController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXNewPayOrderListViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXSelfHelpViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXDrinkViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"UserSettingViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"MineViewController"
)]
||
[
vc
isKindOfClass
:
NSClassFromString
(
@"ZXMallViewController"
)]
)
{
[
self
.
navigationController
popToViewController
:
vc
animated
:
YES
];
isFound
=
YES
;
break
;
}
}
if
(
isFound
==
NO
)
{
[
self
.
navigationController
popToRootViewControllerAnimated
:
YES
];
}
});
}
...
...
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/rym.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
88ce3fd0
...
...
@@ -8,41 +8,122 @@
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
1
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
Bugly.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
10
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
DTCoreText.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
11
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
DTFoundation.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
12
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
FMDB.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
13
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
GDTMobSDK.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
14
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
HappyDNS.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
15
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
IQKeyboardManager.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
16
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
JCore.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
17
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
JJException.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
18
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
JPush.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
19
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
JXCategoryView.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
20
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
MJExtension.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
4
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
MJRefresh.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
5
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
Masonry.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
3
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
Pods-ColorfulSchool.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
6
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
Qiniu.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
21
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
ReactiveCocoa.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
22
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
SDWebImage.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
SVProgressHUD.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
8
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
XRCarouselView.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
isShown
<
/k
e
y
>
<
fa
ls
e
/
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
9
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
k
e
y
>
SuppressBuildableAutocreation
<
/k
e
y
>
...
...
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