no message

zhangxiaowen
1 parent 37e7bcee
Showing 9 changed files with 57 additions and 141 deletions
CNLiveIntegralModule/Classes/Controller/CNLiveTaskListController.m
CNLiveIntegralModule/Classes/Module/CNLiveIntegralService.m
CNLiveIntegralModule/Classes/Tools/CNLiveGoldWhereaboutsView.h
CNLiveIntegralModule/Classes/Tools/CNLiveGoldWhereaboutsView.m
CNLiveIntegralModule/Classes/Tools/CNLiveRewardRulesView.h
CNLiveIntegralModule/Classes/Tools/CNLiveRewardRulesView.m
CNLiveIntegralModule/Classes/Tools/CNLiveSignInView.m
Example/CNLiveIntegralModule.xcodeproj/project.pbxproj
Example/CNLiveIntegralModule/CNLIVEAppDelegate.m
@@ -50,8 +50,6 @@
 @property (nonatomic, strong) UIButton *backButton;
 @property (nonatomic, strong) UILabel *titleLabel;
-//@property (nonatomic, strong) CNTouristsLoginTipsView *fuzzyView;//游客登录弹框
-
 @end
 @implementation CNLiveTaskListController
@@ -63,7 +61,7 @@
     }
     else if ([type isEqualToString:@"publish_witness"]){//发布目击者
-        [self selectChannelId:@"1" classifyId:@"101"];
+//        [self selectChannelId:@"1" classifyId:@"101"];
     }
     else if ([type isEqualToString:@"add_friend"]){//添加好友
@@ -77,19 +75,19 @@
     }
     else if ([type isEqualToString:@"share_video"]){//分享目击者视频
-        [self selectChannelId:@"1" classifyId:@"101"];
+//        [self selectChannelId:@"1" classifyId:@"101"];
     }
     else if ([type isEqualToString:@"share_article"]){//分享文章
-        [self selectChannelId:@"1" classifyId:@"102"];
+//        [self selectChannelId:@"1" classifyId:@"102"];
     }
     else if ([type isEqualToString:@"publish_comment"]){//评论
-        [self selectChannelId:@"1" classifyId:@"101"];
+//        [self selectChannelId:@"1" classifyId:@"101"];
     }
     else if ([type isEqualToString:@"read_article"]){//看文章-> 视讯中国 -> 今日要闻
-        [self selectChannelId:@"1" classifyId:@"102"];
+//        [self selectChannelId:@"1" classifyId:@"102"];
     }
     else if ([type isEqualToString:@"customer_feedback"]){//帮助与反馈
@@ -104,7 +102,7 @@
 //        [[AppDelegate sharedAppDelegate] pushViewController:webVC withBackTitle:@" "];
     }
     else if ([type isEqualToString:@"watch_video"]){//看视频 -> 视讯中国 -> 目击者
-        [self selectChannelId:@"1" classifyId:@"101"];
+//        [self selectChannelId:@"1" classifyId:@"101"];
     }
     else if ([type isEqualToString:@"check_in"]){//签到
@@ -115,100 +113,14 @@
 //        [self.navigationController popViewControllerAnimated:YES];
     }
     else if ([type isEqualToString:@"listen_novel"]){//听小说
-        [self selectChannelId:@"219" classifyId:@"215"];
+//        [self selectChannelId:@"219" classifyId:@"215"];
     }
 }
-- (void)selectChannelId:(NSString *)channelId classifyId:(NSString *)classifyId{
-    NSInteger channel = [self containsWithChannelId:channelId];
-    if(channel == -1){
-//        [[UIApplication sharedApplication].keyWindow addSubview:self.fuzzyView];
-    
-    }else{
-        NSInteger classify = [self containsWithChannelIndex:channel classifyId:classifyId];
-        if(classify == -1){
-            [self selectTabbarControllerItem:1 channelId:channel classifyId:0];
-        }else{
-            [self selectTabbarControllerItem:1 channelId:channel classifyId:classify];
-        }
-        
-    }
-}
-- (void)selectTabbarControllerItem:(NSInteger)item channelId:(NSInteger)channelId classifyId:(NSInteger)classifyId{
-//    CNTabBarViewController *tabbarController = (CNTabBarViewController *)[AppDelegate sharedAppDelegate].window.rootViewController;
-//    tabbarController.selectedIndex = item;
-//    if([self.isFrom isEqualToString:@"Classify"]){
-//        [self.navigationController popViewControllerAnimated:YES];
-//    }
-//
-//    if (![CNWebRedirectHandle manager].isSelectedClassify) {
-//        [CNWebRedirectHandle manager].isClickedIntegral = YES;
-//        [CNWebRedirectHandle manager].channelId = channelId;
-//        [CNWebRedirectHandle manager].classifyId = classifyId;
-//        return;
-//    }
-//
-//    //分类
-//    CNNavigationController *nav = tabbarController.childViewControllers[item];
-//    CNClassifySegmentController *vc = nav.childViewControllers[0];
-//
-//    if([vc isKindOfClass:[CNClassifySegmentController class]]){
-//        //视讯中国 - 听见中国
-//        [vc categoryView:vc.titleImageCategoryView didSelectedItemAtIndex:channelId];
-//
-//        CNSubClassifySegmentController *svc = [vc.vcArrayM safetyObjectAtIndex:channelId];
-//        if([svc isKindOfClass:[CNSubClassifySegmentController class]]){
-//            //目击者 - 今日要闻 - 中国冰雪
-//            [svc categoryView:svc.categoryView didSelectedItemAtIndex:classifyId];
-//
-//        }
-//    }
-}
-//判断是否有这个频道 -- 一级
-- (NSInteger)containsWithChannelId:(NSString *)channelId {
-//    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
-//    NSMutableArray *channelArray = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:normalKey]];
-//
-//    NSInteger i = 0;
-//    for (NSString *str in channelArray) {
-//        NSDictionary *dic = CNLiveStringJsonToDictionary(str);
-//        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
-//        if ([model.id isEqualToString:channelId]) {
-//            return i;
-//        }
-//        i++;
-//    }
-    return -1;
-    
-}
-//判断有这个频道的分类在第几个 -- 二级
-- (NSInteger)containsWithChannelIndex:(NSInteger)index classifyId:(NSString *)classifyId {
-//    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
-//    NSMutableArray *channelArray = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:normalKey]];
-//    NSInteger i = 0;
-//
-//    if(channelArray.count > index){
-//        NSString *modelStr = channelArray[index];
-//        NSDictionary *dic = CNLiveStringJsonToDictionary(modelStr);
-//        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
-//        for (CNCategoryGetChannelModel *subModel in model.pageStyleList) {
-//            if ([subModel.id isEqualToString:classifyId]) {
-//                return i;
-//            }
-//            if (CNLiveStringIsEmpty(subModel.pageType)) {
-//                continue;
-//            }else{
-//                i++;
-//            }
-//        }
-//    }
-    return -1;
-    
-}
 #pragma mark - Data
 - (void)loadData{
 //    NSDictionary *params = @{@"sid":CNUserShareModel.uid};
@@ -266,7 +178,8 @@
     [self loadData];
     [self createUI];
-    
+    [CNLiveGoldWhereaboutsView showWithDesc:@"asd" delegate:self];
+
 }
 - (void)dealloc{
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"AddScoreRequestSuccess" object:nil];
@@ -14,19 +14,16 @@
 // 任务列表
 #import "CNLiveTaskListController.h"
-// 积分明细
-#import "CNLiveIntegralDetailsController.h"
 // 增加积分
 #import "CNLiveAddScoreManager.h"
 #import "CNLiveAddScoreView.h"
-
 // 金币下落
 #import "CNLiveGoldWhereaboutsView.h"
-
 // 签到
 #import "CNLiveSignInView.h"
+#import "CNLiveScoreModel.h"
 @BeeHiveService(CNLiveIntegralServiceProtocol,CNLiveIntegralService)
 @interface CNLiveIntegralService ()<CNLiveIntegralServiceProtocol>
@@ -51,17 +48,6 @@
 //    [CNLivePageJumpManager pushViewController:vc];
 }
-#pragma mark - 积分明细
-// 积分明细
-- (UIViewController *)getIntegralDetailsViewController {
-    return [CNLiveIntegralDetailsController new];
-}
-
-- (void)pushToIntegralDetailsViewController {
-    CNLiveIntegralDetailsController *vc = [[CNLiveIntegralDetailsController alloc]init];
-//    [CNLivePageJumpManager pushViewController:vc];
-}
-
 #pragma mark - 增加积分
 // 请求
 //延时调用
@@ -83,49 +69,48 @@
     [CNLiveAddScoreManager requestTaskId:taskId contentId:contentId block:block];
 }
-- (BOOL)judgeIsAddScoreJson:(NSString *)name taskType:(NSString *)taskType taskId:(NSString *)taskId{
-    return [CNLiveAddScoreManager judgeIsAddScoreJson:name taskType:taskType taskId:taskId];
-}
-
-- (BOOL)writeJsonName:(NSString *)name dic:(NSDictionary *)dic{
-    return [CNLiveAddScoreManager writeJsonName:name dic:dic];
-}
-
 // 视图
-+ (void)showAddScoreViewWithDesc:(NSString *)desc score:(NSString *)score{
+- (void)showAddScoreViewWithDesc:(NSString *)desc score:(NSString *)score{
     [CNLiveAddScoreView showWithDesc:desc score:score];
 }
-+ (void)showAddScoreViewWithDesc:(NSString *)desc score:(NSString *)score delegate:(id<CNLiveAddScoreViewDelegate>)delegate{
+- (void)showAddScoreViewWithDesc:(NSString *)desc score:(NSString *)score delegate:(id<CNLiveAddScoreViewDelegate>)delegate{
     [CNLiveAddScoreView showWithDesc:desc score:score delegate:delegate];
 }
-+ (void)hideAddScoreView{
+- (void)hideAddScoreView{
     [CNLiveAddScoreView hide];
 }
 #pragma mark - 金币下落
-// 游客模式浏览加积分
-+ (void)showGoldWhereaboutsViewWithDesc:(NSString *)desc delegate:(id)delegate{
-    [CNLiveGoldWhereaboutsView showWithDesc:desc delegate:delegate];
+// 默认签到
+- (void)showGoldWhereaboutsViewWithModel:(CNLiveScoreModel *)model{
+    [CNLiveGoldWhereaboutsView showWithModel:model];
+
+}
+
+- (void)showGoldWhereaboutsViewWithDic:(NSDictionary *)dic{
+    CNLiveScoreModel * model = [CNLiveScoreModel mj_objectWithKeyValues:dic];
+    [CNLiveGoldWhereaboutsView showWithModel:model];
+
 }
 // 默认展示添加积分视图
-+ (void)showGoldWhereaboutsViewWithDesc:(NSString *)desc score:(NSString *)score{
+- (void)showGoldWhereaboutsViewWithDesc:(NSString *)desc score:(NSString *)score{
     [CNLiveGoldWhereaboutsView showWithDesc:desc score:score];
 }
-// 默认签到
-+ (void)showGoldWhereaboutsViewModel:(CNLiveScoreModel *)model{
-    [CNLiveGoldWhereaboutsView show:model];
-
+// 游客模式浏览加积分
+- (void)showGoldWhereaboutsViewWithDesc:(NSString *)desc delegate:(id)delegate{
+    [CNLiveGoldWhereaboutsView showWithDesc:desc delegate:delegate];
 }
-+ (void)hideGoldWhereaboutsView{
+
+- (void)hideGoldWhereaboutsView{
     [CNLiveGoldWhereaboutsView hide];
 }
 #pragma mark - 签到
-+ (void)showSignInView:(NSString *)score scores:(NSString *)scores day:(NSInteger)day url:(NSString *)url{
+- (void)showSignInViewWithScore:(NSString *)score scores:(NSString *)scores day:(NSInteger)day url:(NSString *)url{
     [CNLiveSignInView showWithScore:score scores:scores day:day url:url];
 }
@@ -25,7 +25,7 @@ typedef NS_ENUM(NSUInteger, CNLiveGoldWhereaboutsViewType) {
 @interface CNLiveGoldWhereaboutsView : CAEmitterLayerView
 // 默认签到
-+ (void)show:(CNLiveScoreModel *)model;
++ (void)showWithModel:(CNLiveScoreModel *)model;
 // 默认展示添加积分视图
 + (void)showWithDesc:(NSString *)desc score:(NSString *)score;
@@ -47,7 +47,7 @@
 }
-+ (void)show:(CNLiveScoreModel *)model {
++ (void)showWithModel:(CNLiveScoreModel *)model {
     CNLiveGoldWhereaboutsView *sView = [[CNLiveGoldWhereaboutsView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)];
     sView.model = model;
     [[UIApplication sharedApplication].keyWindow addSubview:sView];
@@ -87,7 +87,9 @@
         snowFlake.yAcceleration = 2500.f;
         snowFlake.emissionRange = 0.5 * M_PI;
         snowFlake.spinRange = 0.25 * M_PI;
-        snowFlake.contents = (__bridge id _Nullable)([UIImage imageNamed:[NSString stringWithFormat:@"gold_whereabouts%d",i]].CGImage);
+        
+        UIImage *image = [self xw_getImageName:[NSString stringWithFormat:@"gold_whereabouts%d",i] bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
+        snowFlake.contents = (__bridge id _Nullable)(image.CGImage);
         snowFlake.lifetime = 100.f;
         snowFlake.scale = 0.08;
@@ -246,4 +248,20 @@
     [self hide];
 }
+/**
+ *  创建图片
+ *
+ *  @param imageName 图片名字
+ *  @param bundleName 图片所在的bundle名字
+ *  @param targetClass 类和bundle的同级目录
+ *  @return 返回UIImage
+ */
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
+    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
+    NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+}
+
 @end
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveRewardRulesView : UIView
-+ (void)show:(NSString *)url;
++ (void)showWithUrl:(NSString *)url;
 @end
@@ -25,7 +25,7 @@
 static const NSInteger margin = 0;
 #pragma mark - Using Method
-+ (void)show:(NSString *)url{
++ (void)showWithUrl:(NSString *)url{
     CNLiveRewardRulesView *view = [[CNLiveRewardRulesView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
     view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
     [view.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
@@ -183,7 +183,7 @@ static const NSInteger margin = 15;
 #pragma mark - Action
 - (void)clickRulesBtn:(UIButton *)btn{
     [self removeFromSuperview];
-    [CNLiveRewardRulesView show:self.url];
+    [CNLiveRewardRulesView showWithUrl:self.url];
 }
 - (void)clickCloseBtn:(UIButton *)btn{
@@ -207,7 +207,7 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				4C2E5425FBAFD3161FA4DFD3 /* [CP] Embed Pods Frameworks */,
+				9A8784A7A4161CC30484D821 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -320,7 +320,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		4C2E5425FBAFD3161FA4DFD3 /* [CP] Embed Pods Frameworks */ = {
+		9A8784A7A4161CC30484D821 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -38,7 +38,7 @@
     [self.window makeKeyAndVisible];
-    [CNLiveGoldWhereaboutsView showWithDesc:@"asd" delegate:self];
+//    [CNLiveGoldWhereaboutsView showWithDesc:@"asd" delegate:self];
 //    [CNLiveAddScoreView showAddScoreViewWithDesc:@"asd" login:@"asdasd" delegate:self];