Skip to content

C
colorfulSchoolReconsitution
Commit 92484515 by 刘卓鑫
Options

紧急修复

parent c32cb351
Showing with 34 additions and 119 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
......@@ -48,6 +48,7 @@
1C5B26BE225B3B8F001B0E1B /* ZXUserSettingModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26BC225B3B8E001B0E1B /* ZXUserSettingModel.m */; };
1C642757230FBB5E00AEC294 /* ZJAnimationPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C642755230FBB5D00AEC294 /* ZJAnimationPopView.m */; };
1C64275A230FBF3200AEC294 /* ZXPopAnimationTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C642759230FBF3200AEC294 /* ZXPopAnimationTool.m */; };
1C64275C2314C36D00AEC294 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C64275B2314C36C00AEC294 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
1C73BEED22439F8D0078947F /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C73BEEC22439F8C0078947F /* SafariServices.framework */; };
1C73BEEF2243A0080078947F /* EventKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C73BEEE2243A0070078947F /* EventKit.framework */; };
1C73BEFB22447DA90078947F /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C73BEFA22447DA90078947F /* MessageUI.framework */; };
......@@ -767,6 +768,7 @@
1C642756230FBB5D00AEC294 /* ZJAnimationPopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZJAnimationPopView.h; sourceTree = "<group>"; };
1C642758230FBF3200AEC294 /* ZXPopAnimationTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXPopAnimationTool.h; sourceTree = "<group>"; };
1C642759230FBF3200AEC294 /* ZXPopAnimationTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXPopAnimationTool.m; sourceTree = "<group>"; };
1C64275B2314C36C00AEC294 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
1C73BEEC22439F8C0078947F /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
1C73BEEE2243A0070078947F /* EventKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EventKit.framework; path = System/Library/Frameworks/EventKit.framework; sourceTree = SDKROOT; };
1C73BEF822447CB40078947F /* BaiduMobAdSDK */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = BaiduMobAdSDK; path = "ColorfulSchool/Classes/百度广告/BaiduMobAdSDK.framework/BaiduMobAdSDK"; sourceTree = "<group>"; };
......@@ -1881,6 +1883,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1C64275C2314C36D00AEC294 /* UserNotifications.framework in Frameworks */,
1C394133230BFAA1005048EB /* libjpush-ios-3.2.2.a in Frameworks */,
1C394131230BFA96005048EB /* libjcore-ios-2.1.1.a in Frameworks */,
1CD9E5232284079800FFDA29 /* CoreBluetooth.framework in Frameworks */,
......@@ -2775,6 +2778,7 @@
6AD790EF05956215F01669B0 /* Frameworks */ = {
isa = PBXGroup;
children = (
1C64275B2314C36C00AEC294 /* UserNotifications.framework */,
1C394132230BFAA1005048EB /* libjpush-ios-3.2.2.a */,
1C394130230BFA95005048EB /* libjcore-ios-2.1.1.a */,
1C3940F7230A712F005048EB /* libjpush-ios-3.1.1.a */,
......
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
......@@ -62,7 +62,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
......
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -37,53 +37,5 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/MineView(&#x4e2a;&#x4eba;&#x4e2d;&#x5fc3;)/UserSetting/UserSet/Controller/ZXSettingViewController.m"
timestampString = "588079587.052711"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
endingLineNumber = "252"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
<Locations>
<Location
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__59-[ZXSettingViewController tableView:cellForRowAtIndexPath:]_block_invoke_3.233"
moduleName = "ColorfulSchool"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/liuzhuoxin/codeStore/colorfulSchoolReconsitution/ColorfulSchool/ColorfulSchool/Classes/MineView(%E4%B8%AA%E4%BA%BA%E4%B8%AD%E5%BF%83)/UserSetting/UserSet/Controller/ZXSettingViewController.m"
timestampString = "588079587.348212"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
endingLineNumber = "252"
offsetFromSymbolStart = "96">
</Location>
<Location
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__59-[ZXSettingViewController tableView:cellForRowAtIndexPath:]_block_invoke_4"
moduleName = "ColorfulSchool"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/liuzhuoxin/codeStore/colorfulSchoolReconsitution/ColorfulSchool/ColorfulSchool/Classes/MineView(%E4%B8%AA%E4%BA%BA%E4%B8%AD%E5%BF%83)/UserSetting/UserSet/Controller/ZXSettingViewController.m"
timestampString = "588079587.35368"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
endingLineNumber = "252"
offsetFromSymbolStart = "32">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.m
......@@ -37,12 +37,12 @@
//请求最新的是否需要曝光配置
[ZXTool requestIsNeedExposure];
//京东cps联盟
[[KeplerApiManager sharedKPService] asyncInitSdk:@"02dda8fb6452fadc99e2a5c3c8910192" secretKey:@"9fe020c81dbd420ea3bc894d38e2d1c5" sucessCallback:^(){
NSLog(@"京东联盟sdk注册成功");
}failedCallback:^(NSError *error){
//京东联盟sdk注册失败
NSLog(@"京东联盟sdk注册失败---%@", error);
}];
// [[KeplerApiManager sharedKPService] asyncInitSdk:@"02dda8fb6452fadc99e2a5c3c8910192" secretKey:@"9fe020c81dbd420ea3bc894d38e2d1c5" sucessCallback:^(){
// NSLog(@"京东联盟sdk注册成功");
// }failedCallback:^(NSError *error){
// //京东联盟sdk注册失败
// NSLog(@"京东联盟sdk注册失败---%@", error);
// }];
//bugly
[Bugly startWithAppId:@"d3a5bd8d35"];
......
ColorfulSchool/ColorfulSchool/AppDelegate.m
......@@ -188,7 +188,6 @@
[[UIScreen mainScreen] setBrightness:1];//点亮
}
}
} @catch (NSException *exception) {
} @finally {
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/YWTPay(新版支付)/Controller/ZXNewConfirmPayViewController.m
//
//
......@@ -127,6 +127,7 @@
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
sender.enabled = YES;
});
[ZXTool showLoadingAnimation];
int callType = 1;
BOOL isCanOpenYWT = [kApplication canOpenURL:[NSURL URLWithString:@"cmbmobilebank://"]];
if ([self.payType.payType isEqualToString:@"5"] && !isCanOpenYWT) {
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/LoginView.m
//
//
......@@ -151,22 +151,24 @@
token = @"";
}
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/app/customer/login", [kUserDefaults objectForKey:@"NEW_PAY"]] para:@{@"loginAccount":accoun, @"password":password} completed:^(CommonModel *common, NSString *error) {
if (error) {
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
if (error) {
[ZXTool showText:error];
});
} else {
ZXUserModel *user = [ZXUserModel mj_objectWithKeyValues:common.data];
[UserManager sharedUserManager].user = user;//单利存储
[ZXUserModel clearTable];
[user save];
[ZXTool saveUserInfo:user];
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
}
} else {
ZXUserModel *user = [ZXUserModel mj_objectWithKeyValues:common.data];
[UserManager sharedUserManager].user = user;//单利存储
[ZXUserModel clearTable];
[user save];
[ZXTool saveUserInfo:user];
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
}
});
}];
}
......
ColorfulSchool/Podfile
......@@ -6,6 +6,7 @@ target 'ColorfulSchool' do
pod 'MJRefresh'
pod 'SVProgressHUD'
pod 'AFNetworking', '~> 2.6.3'
# pod 'AFNetworking', '~> 3.2.1'
pod 'Masonry'
pod 'XRCarouselView'
pod 'JPush'
......
ColorfulSchool/Podfile.lock
......@@ -159,6 +159,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM: c232ef3ab8b49acf93a507268db56b14b00c41dd
PODFILE CHECKSUM: f205566b0291bc4c55751796d8fab5ab6edb83fd
COCOAPODS: 1.7.5
ColorfulSchool/Pods/Manifest.lock
......@@ -159,6 +159,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM: c232ef3ab8b49acf93a507268db56b14b00c41dd
PODFILE CHECKSUM: f205566b0291bc4c55751796d8fab5ab6edb83fd
COCOAPODS: 1.7.5
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -8,155 +8,111 @@
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Bugly.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>DTCoreText-Resources.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>DTCoreText.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>DTFoundation.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>FMDB.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>GDTMobSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>HappyDNS.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>IQKeyboardManager.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>JCore.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>JJException.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>JPush.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>JXCategoryView.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>MJExtension.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>18</integer>
</dict>
<key>MJRefresh.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>Masonry.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>Pods-ColorfulSchool.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>20</integer>
</dict>
<key>Qiniu.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>21</integer>
</dict>
<key>ReactiveCocoa.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>22</integer>
</dict>
<key>SDWebImage.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>23</integer>
</dict>
<key>SVProgressHUD.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>24</integer>
</dict>
<key>XRCarouselView.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>25</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment