绿色干净版本

KXCardHelp.xcworkspace/xcuserdata/mortimer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,5 +13,37 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/Main/Home/VC/JCYCHHomeViewController.m"
+            timestampString = "556700565.250088"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "116"
+            endingLineNumber = "116"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/AppDelegate/AppDelegate.m"
+            timestampString = "556700565.250504"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "175"
+            endingLineNumber = "175"
+            landmarkName = "-xhLaunchAd:clickAndOpenModel:clickPoint:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KXCardHelp/AppDelegate/AppDelegate.m

@@ -88,7 +88,7 @@ UNUserNotificationCenterDelegate
     [XHLaunchAd setWaitDataDuration:2];
     
     //广告数据请求
-    [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/Advert/V1/getAdvert",advURL] parameter:@{@"space_sign" : @"18"} success:^(id responseObject) {
+    [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/Advert/V1/getAdvert",advURL] parameter:@{@"space_sign" :AppdelegateAdvID} success:^(id responseObject) {
         NSNumber *code = responseObject[@"code"];
         if ([code isEqual:0]) {
             //
@@ -151,7 +151,7 @@ UNUserNotificationCenterDelegate
     //异步发送广告记录
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         KXAdAlertModel *model = self.dataArray.firstObject;
-        [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/api/Advert/V1/advertRecord",advURL] parameter:@{@"space_sign" : @"18", @"advert_id" : model.ID} success:^(id responseObject) {
+        [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/api/Advert/V1/advertRecord",advURL] parameter:@{@"space_sign" : AppdelegateAdvID, @"advert_id" : model.ID} success:^(id responseObject) {
             //
             NSLog(@"%@", responseObject);
         } faliure:^(id error) {
@@ -162,12 +162,19 @@ UNUserNotificationCenterDelegate
     
     NSString *urlString = (NSString *)openModel;
     UIViewController *rootViewController = self.window.rootViewController;
-    KXWKWebViewVC *webVC    = [[KXWKWebViewVC alloc]init];
-    webVC.urlStr = urlString;
-    webVC.hidesBottomBarWhenPushed = YES;
-    NSArray *childsVC = [rootViewController childViewControllers];
-    UINavigationController *navVC = childsVC.firstObject;
-    [navVC pushViewController:webVC animated:YES];
+    JCYCHWebViewController *webVC=[[JCYCHWebViewController alloc]init];
+    webVC.url = urlString;
+    if ([rootViewController isKindOfClass:[JCYCHBaseTabBarViewController class]]) {
+        NSArray *childsVC = [rootViewController childViewControllers];
+        UINavigationController *navVC = childsVC.firstObject;
+        [navVC pushViewController:webVC animated:YES];
+    }else if([rootViewController isKindOfClass:[UINavigationController class]]) {
+        UINavigationController *nav=(UINavigationController *)rootViewController;
+        [nav pushViewController:webVC animated:YES];
+    }else{
+        [rootViewController.navigationController pushViewController:webVC animated:YES];
+    }
+    
 }
 
 
@@ -182,7 +189,8 @@ UNUserNotificationCenterDelegate
         self.window.rootViewController = tab;
     }else{//跳转到登录页面
         JCYCHLoginFirstViewController  *loginFirst=[[JCYCHLoginFirstViewController alloc]init];
-        self.window.rootViewController = loginFirst;
+        JCYCHBaseNavViewController *nav=[[JCYCHBaseNavViewController alloc]initWithRootViewController:loginFirst];
+        self.window.rootViewController = nav;
     }
     [self.window makeKeyAndVisible];
     

KXCardHelp/AppDelegate/HFile/JCYCHDefineHeader.h

@@ -36,15 +36,18 @@
 #define KXAlertTextDate @"KXAlertTextDate"
 
 //渠道号
-#define CHCHANNEL_ID @"2000"
+#define CHCHANNEL_ID        @"2002"//--
+#define HomeAdvID           @"17"//弹窗
+#define AppdelegateAdvID    @"18"//启动图
+
 #define CHTOKEN @"CHTOKEN"
 #define CHNinePWD @"CHNinePWD"
 //字符串宏
-#define  UMAPP_KEY  @"5b4856abf43e480cc600003e"//---
-#define  BUGLY_ID   @"535ec42f09"             //---
-#define APPLE_APP_ID @"1424158479"            //----
-#define BAIDU_APP_ID @"jUrGeGPsjGIT2nqGiGcoPGc6"//--
-#define BAIDU_SECRET @"8Rjs8fbKvtFXOAaRABnOvTxGfVsxXflt"//---
+#define  UMAPP_KEY  @"5b7e1f9fb27b0a6573000010"//--
+#define  BUGLY_ID   @"2b8be66cb7"//--
+#define APPLE_APP_ID @"1433874143"//--
+#define BAIDU_APP_ID @"fLeeuCReuMCTlBFeQzIKjXhm"//--
+#define BAIDU_SECRET @"98fXjaxW73HHCt4QhYmhfCdCu4md2NgK"//--
 //公钥
 #define RSAPublicKey @"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4G6ZCXm4oFZD4cW3wHxUPBfeEKJJmfyGruOMwvT4W/r6FbD1ptEPrcnCDjmhqXwA2egxEWWojgXwxd7/JXFYRxiahPcwQBK4UfY7C7evpwp5J2v/v6FMeV6k/DWaVHX6z7un8W12E6LEosAFL+JLF11y3cXaHwITkQMToVhfz9QIDAQAB"
 

KXCardHelp/AppDelegate/HFile/JCYCHURLHeader.h

@@ -11,15 +11,15 @@
 #ifndef CHURLHeader_h
 #define CHURLHeader_h
 //测试环境
-#define BaseURL  @"http://182.92.118.1:5240"
-static NSString *const advURL = @"http://182.92.118.1:8070/api";   //广告测试URL
+//#define BaseURL  @"http://182.92.118.1:5240"
+//static NSString *const advURL = @"http://182.92.118.1:8070/api";   //广告测试URL
 
 
 //仿真环境
 
-//真实环境
-//#define BaseURL     @"https://api.lanjiekuan.com"
-//static NSString *const advURL = @"http://ads.726p.com/api";   //广告线上URL
+//真实环
+#define BaseURL     @"https://api.lanjiekuan.com"
+static NSString *const advURL = @"http://ads.726p.com/api";   //广告线上URL
 /**********************************************************/
 #pragma mark -登录注册
 

KXCardHelp/Info.plist

@@ -23,9 +23,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MiSDKAppID</key>
-	<string>2882303761517847488</string>
+	<string>2882303761517852566</string>
 	<key>MiSDKAppKey</key>
-	<string>5321784761488</string>
+	<string>5681785253566</string>
 	<key>MiSDKRun</key>
 	<string>${MiSDKRun}</string>
 	<key>NSAppTransportSecurity</key>

KXCardHelp/Main/Ad/KXAdAlertView/KXAdAlertView.m

@@ -74,9 +74,11 @@
         self.hiddenPageControl  = NO;
         self.adDataList         = dataList;
         NSLog(@"self.frame-%@",NSStringFromCGRect(self.frame));
-        
-        [[UIApplication sharedApplication].keyWindow addSubview:self];
-        
+        if (view) {
+            [view addSubview:self];
+        }else{
+            [[UIApplication sharedApplication].keyWindow addSubview:self];
+        }
         [self showAlertAnimation];
         UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(removeFromCurrentView:)];
         [self addGestureRecognizer:tapGesture];

KXCardHelp/Main/Home/VC/JCYCHHomeViewController.m

@@ -104,7 +104,7 @@ KXAdAlertDelegate
 }
 
 - (void)loadData {
-    [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/Advert/V1/getAdvert",advURL] parameter:@{@"space_sign" : @"17"} success:^(id responseObject) {
+    [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/Advert/V1/getAdvert",advURL] parameter:@{@"space_sign" : HomeAdvID} success:^(id responseObject) {
         //请求成功显示弹窗
         NSLog(@"----------%@", responseObject);
         self.dataArray = [KXAdAlertModel mj_objectArrayWithKeyValuesArray:responseObject[@"res"]];
@@ -160,7 +160,7 @@ KXAdAlertDelegate
         //异步发送广告记录
         dispatch_async(dispatch_get_global_queue(0, 0), ^{
             NSString *urlString = [NSString stringWithFormat:@"%@/Advert/V1/advertRecord", advURL];
-            [[WWNetWorkingTool sharedNetWorkTool] post:urlString parameter:@{@"space_sign" : @"17", @"advert_id" : model.ID} success:^(id responseObject) {
+            [[WWNetWorkingTool sharedNetWorkTool] post:urlString parameter:@{@"space_sign" : HomeAdvID, @"advert_id" : model.ID} success:^(id responseObject) {
                 //
                 NSLog(@"%@", responseObject);
             } faliure:^(id error) {
@@ -172,9 +172,8 @@ KXAdAlertDelegate
         if ([model.advert_url hasPrefix:@"https://itunes.apple.com/cn/app/"]) {
             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:model.advert_url]];
         } else {
-            KXWKWebViewVC *webVC = [[KXWKWebViewVC alloc]init];
-            webVC.urlStr = model.advert_url;
-            webVC.hidesBottomBarWhenPushed = YES;
+            JCYCHWebViewController *webVC=[[JCYCHWebViewController alloc]init];
+            webVC.url = model.advert_url;
             [self.navigationController pushViewController:webVC animated:YES];
         }
     }];
@@ -188,7 +187,7 @@ KXAdAlertDelegate
     //异步发送广告记录
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         KXAdAlertModel *model = self.dataArray.firstObject;
-        [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/Advert/V1/advertRecord",advURL] parameter:@{@"space_sign" : @"17", @"advert_id" : model.ID} success:^(id responseObject) {
+        [[WWNetWorkingTool sharedNetWorkTool] post:[NSString stringWithFormat:@"%@/Advert/V1/advertRecord",advURL] parameter:@{@"space_sign" : HomeAdvID, @"advert_id" : model.ID} success:^(id responseObject) {
             //
             NSLog(@"%@", responseObject);
         } faliure:^(id error) {
@@ -197,10 +196,9 @@ KXAdAlertDelegate
     });
     
     KXAdAlertModel *adModel  = [self.dataArray objectAtIndex:index];
-    KXWKWebViewVC *webVC    = [[KXWKWebViewVC alloc]init];
-    webVC.urlStr        = adModel.advert_url;
-    webVC.hidesBottomBarWhenPushed = YES;
-    [self.navigationController pushViewController:webVC animated:YES];
+    JCYCHWebViewController *vc=[[JCYCHWebViewController alloc]init];
+    vc.url=adModel.advert_url;
+    [self.navigationController pushViewController:vc animated:YES];
 }
 
 

KXCardHelp/Main/Home/View/JCYCHHomeTopView.m

@@ -58,7 +58,7 @@ static float btnHeight=116;
         _centerView=[[UIView alloc]initWithFrame:CGRectMake(FITSIZE(14), 0, SCREEN_WIDTH-2*FITSIZE(14), 116)];
         _centerView.layer.cornerRadius=6;
         _centerView.layer.masksToBounds=YES;
-        _centerView.backgroundColor=[UIColor CHColorWithHex:0x1B82D2];
+        _centerView.backgroundColor=[UIColor baseColor];
     }
     return _centerView;
 }

KXCardHelp/Main/Person/VC/JCYCHPersonViewController.m

@@ -133,13 +133,15 @@ static NSString *tabelCell = @"tabelCell";
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     NSArray *arr=self.dataArray[section];
-    if (section==1) {
-        return 0;
-    }
-    if (section==2) {
-        return 0;
+    NSString *num=[[NSUserDefaults standardUserDefaults]objectForKey:IOS_TYPE];
+    if (!(num &&[num integerValue]==0)) {
+        if (section==1) {
+            return 0;
+        }
+        if (section==2) {
+            return 0;
+        }
     }
-    
     return arr.count;
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{

KXCardHelp/Main/UserLogin/Login/VC/JCYCHLoginViewController.m

@@ -290,7 +290,7 @@ UITextFieldDelegate
         [attrStr addAttribute:NSFontAttributeName
                         value:[UIFont systemFontOfSize:13.0f]
                         range:NSMakeRange(0, str.length)];
-        [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor CHColorWithHex:0x196CC7] range:NSMakeRange(0, str.length)];
+        [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor baseColor] range:NSMakeRange(0, str.length)];
         _protocolLabel.numberOfLines=1;
         _protocolLabel.attributedText = attrStr;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];

KXCardHelp/Main/UserLogin/VC/JCYCHCheckNineLockViewController.m

@@ -71,12 +71,7 @@
         _forgetPwd.center=CGPointMake(SCREEN_WIDTH/2.f, 146+NavBarHeight+SCREEN_WIDTH-2*FITSIZE(38)+40);
         
         [[_forgetPwd rac_signalForControlEvents:UIControlEventTouchUpInside]subscribeNext:^(id x) {
-            [[NSUserDefaults standardUserDefaults] removeObjectForKey:CHNinePWD];
-            JCYCHLoginFirstViewController  *loginFirst=[[JCYCHLoginFirstViewController alloc]init];
-            [UIApplication sharedApplication].keyWindow.rootViewController=loginFirst;
-            JCYCHLoginViewController *vc=[[JCYCHLoginViewController alloc]init];
-            JCYCHBaseNavViewController *nav=[[JCYCHBaseNavViewController alloc]initWithRootViewController:vc];
-            [loginFirst presentViewController:nav animated:YES completion:nil];
+            [AccountTool deleteAccount];
             
             if (self.forgetPwdBlock) {
                 self.forgetPwdBlock();

KXCardHelp/Main/UserLogin/register/VC/JCYCHRegisterViewController.m

@@ -333,7 +333,7 @@ UITextFieldDelegate
                         value:[UIFont systemFontOfSize:13.0f]
                         range:NSMakeRange(0, str.length)];
         [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor CHColorWithHex:0x535353] range:NSMakeRange(0, 9)];
-        [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor CHColorWithHex:0x196CC7] range:NSMakeRange(9, str.length-9)];
+        [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor baseColor] range:NSMakeRange(9, str.length-9)];
         _protocolLabel.numberOfLines=1;
         _protocolLabel.attributedText = attrStr;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
@@ -360,7 +360,7 @@ UITextFieldDelegate
                         value:[UIFont systemFontOfSize:13.0f]
                         range:NSMakeRange(0, str.length)];
         [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor CHColorWithHex:0x535353] range:NSMakeRange(0, 1)];
-        [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor CHColorWithHex:0x196CC7] range:NSMakeRange(1, str.length-1)];
+        [attrStr addAttribute:NSForegroundColorAttributeName value:[UIColor baseColor] range:NSMakeRange(1, str.length-1)];
         _protocolLabel2.numberOfLines=1;
         _protocolLabel2.attributedText = attrStr;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];