| MIduo.xcodeproj/project.pbxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MIduo/AppDelegate.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MIduo/界面/SJBaseViewController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MIduo.xcodeproj/project.pbxproj
@@ -491,6 +491,10 @@ 2D0DF78D20C642AE002BB619 /* SJUnbindPhoneViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2D0DF78B20C642AE002BB619 /* SJUnbindPhoneViewController.xib */; }; 2D0E729620C0DAE600822DC8 /* SJButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D0E729520C0DAE600822DC8 /* SJButton.m */; }; 2D0F7DB620D0F91600355B51 /* SJTransitionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D0F7DB520D0F91600355B51 /* SJTransitionView.m */; }; 2D100B63212159D000109DAF /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D100B5C212159CF00109DAF /* Reachability.m */; }; 2D100B64212159D000109DAF /* SGNetObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D100B5E212159CF00109DAF /* SGNetObserver.m */; }; 2D100B65212159D000109DAF /* SimplePing.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D100B60212159CF00109DAF /* SimplePing.m */; }; 2D100B66212159D000109DAF /* SimplePinger.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D100B62212159CF00109DAF /* SimplePinger.m */; }; 2D10FAC32108613500C4C3E0 /* WXBindTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D10FAC22108613500C4C3E0 /* WXBindTipsView.m */; }; 2D1175B121199F4000D4CD0F /* ObtainProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D1175AB21199F3F00D4CD0F /* ObtainProperty.m */; }; 2D1175B221199F4000D4CD0F /* PlistFileOperator.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D1175AC21199F3F00D4CD0F /* PlistFileOperator.m */; }; @@ -1452,6 +1456,14 @@ 2D0E729520C0DAE600822DC8 /* SJButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SJButton.m; sourceTree = "<group>"; }; 2D0F7DB420D0F91600355B51 /* SJTransitionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SJTransitionView.h; sourceTree = "<group>"; }; 2D0F7DB520D0F91600355B51 /* SJTransitionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SJTransitionView.m; sourceTree = "<group>"; }; 2D100B5B212159CF00109DAF /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; }; 2D100B5C212159CF00109DAF /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; }; 2D100B5D212159CF00109DAF /* SGNetObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGNetObserver.h; sourceTree = "<group>"; }; 2D100B5E212159CF00109DAF /* SGNetObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGNetObserver.m; sourceTree = "<group>"; }; 2D100B5F212159CF00109DAF /* SimplePing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimplePing.h; sourceTree = "<group>"; }; 2D100B60212159CF00109DAF /* SimplePing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimplePing.m; sourceTree = "<group>"; }; 2D100B61212159CF00109DAF /* SimplePinger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimplePinger.h; sourceTree = "<group>"; }; 2D100B62212159CF00109DAF /* SimplePinger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimplePinger.m; sourceTree = "<group>"; }; 2D10FAC12108613500C4C3E0 /* WXBindTipsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WXBindTipsView.h; sourceTree = "<group>"; }; 2D10FAC22108613500C4C3E0 /* WXBindTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WXBindTipsView.m; sourceTree = "<group>"; }; 2D1175AB21199F3F00D4CD0F /* ObtainProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObtainProperty.m; sourceTree = "<group>"; }; @@ -3226,6 +3238,7 @@ 18AC538B1E5A9876006D1FDF /* lib */ = { isa = PBXGroup; children = ( 2D100B5A212159CF00109DAF /* SGNetObserver */, 2D1175AA21199F2700D4CD0F /* FileManger */, 2D9F157B2117E8E800EFFAFB /* EasyJSWebView-master */, 1845C239209C562C009C639B /* LBXScan */, @@ -3439,6 +3452,22 @@ 18360AEB206C8E8300F9EAB1 /* æç» */, ); path = balance; sourceTree = "<group>"; }; 2D100B5A212159CF00109DAF /* SGNetObserver */ = { isa = PBXGroup; children = ( 2D100B5B212159CF00109DAF /* Reachability.h */, 2D100B5C212159CF00109DAF /* Reachability.m */, 2D100B5D212159CF00109DAF /* SGNetObserver.h */, 2D100B5E212159CF00109DAF /* SGNetObserver.m */, 2D100B5F212159CF00109DAF /* SimplePing.h */, 2D100B60212159CF00109DAF /* SimplePing.m */, 2D100B61212159CF00109DAF /* SimplePinger.h */, 2D100B62212159CF00109DAF /* SimplePinger.m */, ); name = SGNetObserver; path = "../../../../SGNetObserver-master/SGNetObserver"; sourceTree = "<group>"; }; 2D1175AA21199F2700D4CD0F /* FileManger */ = { @@ -3904,6 +3933,7 @@ 1845C450209C562D009C639B /* ZXAddressBookDoCoMoResultParser.m in Sources */, 1865E43C1EF1112A00333767 /* SectionTopicCollectionViewCell.m in Sources */, 1845C4C1209C562E009C639B /* ZXRSSExpandedDecodedNumeric.m in Sources */, 2D100B64212159D000109DAF /* SGNetObserver.m in Sources */, 181ECE271EF369BF00472224 /* ZJSegmentStyle.m in Sources */, 1892034720BE51C6008C1045 /* LBXZXCapture.m in Sources */, 1845C45A209C562D009C639B /* ZXGeoParsedResult.m in Sources */, @@ -3919,6 +3949,7 @@ 1897D9C01E600E94003DF6FE /* ClearCollectionReusableView.m in Sources */, 2D9F158A2117E8E800EFFAFB /* EasyJSWebViewProxyDelegate.m in Sources */, 1845C4BE209C562E009C639B /* ZXRSSExpandedCurrentParsingState.m in Sources */, 2D100B65212159D000109DAF /* SimplePing.m in Sources */, 187522901E654D6900B6AE15 /* SureWebViewController.m in Sources */, 18D399AD1EA765AD00A01CD3 /* thirdClassificationViewController.m in Sources */, 1845C514209C562E009C639B /* ZXQRCodeEncoder.m in Sources */, @@ -3971,6 +4002,7 @@ 182BEB601EAA081400B11FC5 /* LXAlertView.m in Sources */, 1810FBF91E7FBDBB005B42B3 /* NSString+Utils.m in Sources */, 1892034320BE51C6008C1045 /* LBXScanView.m in Sources */, 2D100B63212159D000109DAF /* Reachability.m in Sources */, 2D43E74E211D92790008BA48 /* ALAnomalyNetWorkView.m in Sources */, 2D6858F420DB5D8B00E4376A /* SJCouponCollectionViewCell.m in Sources */, 1845C47D209C562D009C639B /* ZXBitMatrix.m in Sources */, @@ -4025,6 +4057,7 @@ 1896F26D1FD0ED96009D6EEF /* RecommendCouponViewController.m in Sources */, 18D9541A20AE705C005D5D02 /* FeignGoodsDetaiViewController.m in Sources */, 1845C4A1209C562E009C639B /* ZXDataMatrixDefaultPlacement.m in Sources */, 2D100B66212159D000109DAF /* SimplePinger.m in Sources */, 1845C4B2209C562E009C639B /* ZXAbstractExpandedDecoder.m in Sources */, 1845C4D6209C562E009C639B /* ZXEAN13Reader.m in Sources */, 1845C4B4209C562E009C639B /* ZXAI01320xDecoder.m in Sources */, MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstateBinary files differ
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,94 @@ <Bucket type = "0" version = "2.0"> <Breakpoints> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint"> <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" scope = "0" stopOnStyle = "0"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MIduo/界面/我的/MergeAccountViewController.h" timestampString = "555402530.7800241" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "28" endingLineNumber = "28"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MIduo/界面/我的/LoginViewController.m" timestampString = "555588815.727405" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "561" endingLineNumber = "561" landmarkName = "-WeChatHasLoged:" landmarkType = "7"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MIduo/界面/我的/MineViewController.m" timestampString = "555582159.340149" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "679" endingLineNumber = "679" landmarkName = "-noticeOrderOrShopCarBackWithLoginVc" landmarkType = "7"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MIduo/界面/搜索/searchDetailViewController.m" timestampString = "555588815.727831" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "640" endingLineNumber = "640" landmarkName = "-searchDataWithText:WithPage:WithFilter:WithOrder:WithStartPrice:WithEndPrice:" landmarkType = "7"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../SGNetObserver-master/SGNetObserver/SGNetObserver.m" timestampString = "555841396.6715159" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "78" endingLineNumber = "78" landmarkName = "-networkStatusDidChanged" landmarkType = "7"> </BreakpointContent> </BreakpointProxy> </Breakpoints> </Bucket> MIduo/AppDelegate.m
@@ -206,7 +206,7 @@ [dic setObject:[YTHsharedManger startManger].deviceToken forKey:@"deviceToken"]; [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"]; NSMutableDictionary * dictionary = [SJNetwork CommonDictionarywithDic:dic]; [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"push/uidBindDeviceToken"] param:dictionary success:^(NSDictionary *object) { [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"push/uidBindDeviceToken"] param:dictionary isMainOrDynamic:YES success:^(NSDictionary *object) { NSLog(@"%@",object); } fail:^(id object) { NSLog(@"%@",object); @@ -267,7 +267,7 @@ [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"]; NSMutableDictionary * dictionary = [SJNetwork CommonDictionarywithDic:dic]; [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/findAccountMessageList"] param:dictionary success:^(NSDictionary *object) { [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/findAccountMessageList"] param:dictionary isMainOrDynamic:YES success:^(NSDictionary *object) { NSLog(@"%@",object); // NSInteger code = [object[@"code"]integerValue]; NSDictionary *dic = object[@"data"]; @@ -433,7 +433,7 @@ NSLog(@"%@",[NSString stringWithFormat:@"%@/%@",domainHTTP,@"push/insertDeviceToken"]); NSMutableDictionary * dictionary = [SJNetwork CommonDictionarywithDic:dic]; [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"push/insertDeviceToken"] param:dictionary success:^(NSDictionary *object) { [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"push/insertDeviceToken"] param:dictionary isMainOrDynamic: YES success:^(NSDictionary *object) { NSLog(@"%@",object); // NSInteger code = [object[@"code"]integerValue]; // [self.datasource removeAllObjects]; @@ -882,7 +882,7 @@ [dic setValue:code forKey:@"code"]; [dic setValue:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"]; NSMutableDictionary * dictionary = [SJNetwork CommonDictionarywithDic:dic]; [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"/user/changeWX"] param:dictionary success:^(NSDictionary *object) { [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"/user/changeWX"] param:dictionary isMainOrDynamic:YES success:^(NSDictionary *object) { if ([object[@"code"]integerValue] == 0) { [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window]; [SVProgressHUD showSuccessWithStatus:BIND_CHANGE_SUCCESS]; MIduo/½çÃæ/SJBaseViewController.m
@@ -7,10 +7,12 @@ // #import "SJBaseViewController.h" #import "SGNetObserver.h" //#define TICK NSDate *startTime = [NSDate date] //#define TOCK NSLog(@"Time: %f", -[startTime timeIntervalSinceNow]) @interface SJBaseViewController () @property (nonatomic,strong) SGNetObserver *observer; @end @@ -30,12 +32,23 @@ self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backbutton]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(NetWorkStatesChange:) name:@"netWorkChangeEventNotification" object:nil]; [self .view addSubview:self.noNetworkView]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkError:) name:@"networkError" object:nil]; self.observer = [SGNetObserver defultObsever]; [self.observer startNotifier]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkStatusChanged:) name:SGReachabilityChangedNotification object:nil]; } - (void)back:(UIBarButtonItem*)item { [self.navigationController popViewControllerAnimated:YES]; } - (void)networkStatusChanged:(NSNotification *)notify{ NSLog(@"notify-------%@",notify.userInfo); // NSDictionary *dic = notify.userInfo; // NSInteger status = [dic[@"status"]integerValue]; // if (status == 0) { // [YTHsharedManger startManger].networkStatus = status; // } } //毫ç§æ°æ¶é´æ³è½¬ @@ -105,6 +118,7 @@ #pragma mark - ç½ç»ç¶æåçååéç¥æ¹æ³ -(void)NetWorkStatesChange:(NSNotification *)sender{ BOOL canThouth = [self checkNetCanUse]; // canThouth = YES; NSLog(@"%d",canThouth); [YTHsharedManger startManger].isCheckNetCanUse = 0; NSDictionary *urlDic = [[NSUserDefaults standardUserDefaults]objectForKey:@"MainUrlArray"]; @@ -234,7 +248,26 @@ return NO; } - (void)networkError:(NSNotification *)notice{ BOOL canThouth = [self checkNetCanUse]; if (canThouth) { if ([self datasourceIsNull]) { [YTHsharedManger startManger].isCheckNetCanUse = -2; self.noNetworkView.primtTitle.text = @"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"; [self.noNetworkView.iconImage setImage:[UIImage imageNamed:@"ç½ç»é误"]]; [self loadNoNetworkView]; NSLog(@"%d",[self datasourceIsNull]); } else { NSLog(@"%d",[self datasourceIsNull]); [_noNetworkView setHidden:YES]; } } } - (void)dealloc{ [[NSNotificationCenter defaultCenter] removeObserver:self]; } - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated.
