提交代码

ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj

@@ -3233,10 +3233,6 @@
 				22E57B471F8E0E54008A753E /* ColorfulSchool.entitlements */,
 				A7DECC542079F0E20039EC22 /* Classes */,
 				A754365021D33182005584CC /* Main(入口) */,
-				A754365121D33182005584CC /* AppDelegate.h */,
-				A754365221D33182005584CC /* AppDelegate.m */,
-				A705BF9521D4AA69004F1628 /* AppDelegate+Extension.h */,
-				A75436F021D34DEA005584CC /* AppDelegate+Extension.m */,
 				1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */,
 				9142D2CE1F35C84E004F90CF /* Info.plist */,
 				9142D2F71F35D212004F90CF /* PrefixHeader.pch */,
@@ -3797,6 +3793,10 @@
 		A754365021D33182005584CC /* Main(入口) */ = {
 			isa = PBXGroup;
 			children = (
+				A754365121D33182005584CC /* AppDelegate.h */,
+				A754365221D33182005584CC /* AppDelegate.m */,
+				A705BF9521D4AA69004F1628 /* AppDelegate+Extension.h */,
+				A75436F021D34DEA005584CC /* AppDelegate+Extension.m */,
 				A7B2B25421D6117A004467A2 /* ViewModel */,
 				9194202A1F37FF520023BD5D /* Modle */,
 				9194202B1F37FF520023BD5D /* Controller */,
@@ -6115,7 +6115,7 @@
 					"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/AdViewBidSDK_iOS-4.0.1",
 					"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/GDTMobSDK",
 				);
-				MARKETING_VERSION = 3.9.23;
+				MARKETING_VERSION = 3.9.30;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -6360,7 +6360,7 @@
 					"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/AdViewBidSDK_iOS-4.0.1",
 					"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/GDTMobSDK",
 				);
-				MARKETING_VERSION = 3.9.23;
+				MARKETING_VERSION = 3.9.30;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -6473,7 +6473,7 @@
 					"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/AdViewBidSDK_iOS-4.0.1",
 					"$(PROJECT_DIR)/ColorfulSchool/Classes/Vendor(三方)/GDTMobSDK",
 				);
-				MARKETING_VERSION = 3.9.23;
+				MARKETING_VERSION = 3.9.30;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ColorfulSchool/ColorfulSchool/AppDelegate.h

-//
-//  AppDelegate.h
-//  ColorfulSchool
-//
-//  Created by Listen on 2017/8/5.
-//  Copyright © 2017年 Colorful Any Door. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end
-

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m

-//
+//
@@ -110,11 +110,11 @@
 //        [self.view addSubview:v];
 //    }];
    
-    
-    if ([[kUserDefaults objectForKey:@"kAPP_IS_OPENB_TASK"] isEqualToString:@"yes"]) {
-        //查看任务相关内容
-        [self tashShow];
-    }
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tashShow) name:kAPP_IS_OPENB_TASK object:nil];
+//    if ([[kUserDefaults objectForKey:@"kAPP_IS_OPENB_TASK"] isEqualToString:@"yes"]) {
+//        //查看任务相关内容
+//        [self tashShow];
+//    }
 }
 
 - (void) tashShow {

ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXLoginViewController.m

-//
+//
@@ -90,7 +90,6 @@
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(jumpProtocol)];
     [protocolLabel addGestureRecognizer:tap];
 
-    
     UILabel *versionLabel = [[UILabel alloc] init];
     [self.view addSubview:versionLabel];
     versionLabel.text = [NSString stringWithFormat:@"v%@", APPversion];

ColorfulSchool/ColorfulSchool/Classes/Task(任务)/ZXTaskViewController.m

-//
+//
@@ -363,7 +363,7 @@
         }
         self.jsFuncName = arr[0];
         [ZXTaskManager sharedZXTaskManager].taskCode = arr[2];
-        [ZXTaskManager sharedZXTaskManager].isTaskCompleted = (taskType == 3);
+        [ZXTaskManager sharedZXTaskManager].isTaskCompleted = (taskType == 3 || taskType == 6);
         switch (taskType) {
             case 1: {//
                 NSInteger adType = [arr[5] integerValue]; //3插屏广告 4 全屏视频广告 5激励视频
@@ -398,7 +398,10 @@
                 
                 break;
             }
-                
+            case 6: {//签到完成
+                [self taskCompleted];
+                break;
+            }
             default:
                 break;
         }

ColorfulSchool/ColorfulSchool/Classes/Vendor(三方)/FSActionSheet/FSActionSheetConfig.m

-//
+//
 //
+
+
+
 //  FSActionSheetConfig.m
 //  FSActionSheet
 //

ColorfulSchool/ColorfulSchool/Main(入口)/AppDelegate.h

+//
+//
+//  AppDelegate.h
+//  ColorfulSchool
+//
+/**
+项目目录
+├── Main（程序单一入口，仅放AppDelegate区分其他文件）
+│   ├── AppDelegate.h
+│   └── AppDelegate.m
+├── Vendor（三方库）
+│   ├── SDWebImage
+│   └── AFNetworking等
+├── Recource(资源文件)
+├── Extension(分类扩展)（通用类目录）
+├── Tool(工具)（系统公共工具类目录）
+├── Config(配置)
+│   ├── Macro（宏定义目录）
+│   ├── APIManager（系统接口配置）
+└── Task(任务)
+├── Macro（宏定义目录）
+├── HomePage(首页)
+├── Found(发现)
+└── BQT(百青藤)
+├── MineView(个人中心)
+├── Login(登录注册)
+├── images.xcassets(系统切图资源目录)
+
+*/
+
+//  Created by Listen on 2017/8/5.
+//  Copyright © 2017年 Colorful Any Door. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end
+

ColorfulSchool/ColorfulSchool/AppDelegate.m → ColorfulSchool/ColorfulSchool/Main(入口)/AppDelegate.m

+//
@@ -73,7 +73,7 @@
     _isPlaying = NO;
     
     //启动环境
-    [APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentTest;
+    [APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentProduct;
     NSLog(@"%@", CachePath);
     //极光推送
     [self initPushWithOptions:launchOptions isProduct:YES];

ColorfulSchool/ColorfulSchool/Main(入口)/Controller/MyTabViewController.m

-//
+//
@@ -101,6 +101,8 @@
                     if ([dic[@"isEnabled"] integerValue] == 1) {
                         if ([dic[@"type"] isEqualToString:@"14"]) {
                             [kUserDefaults setObject:@"yes" forKey:kAPP_IS_OPENB_TASK];
+                            //发送通知
+                            [[NSNotificationCenter defaultCenter] postNotificationName:kAPP_IS_OPENB_TASK object:nil];
                         }
                         [self.switchs addObject:dic];
                     }