no message

zhangxiaowen
1 parent ae36c1b9
Showing 9 changed files with 100 additions and 29 deletions
CNLiveMineModule.podspec
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/Model/CNLiveMineModel.h
CNLiveMineModule/Classes/Model/CNLiveMineRequest.h
CNLiveMineModule/Classes/Model/CNLiveMineRequest.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.h
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
Example/CNLiveMineModule.xcodeproj/project.pbxproj
Example/CNLiveMineModule/CNLIVEAppDelegate.m
@@ -83,6 +83,12 @@ TODO: 网家家-我的模块.
   # 基类
   s.dependency 'CNLiveCommonClass'
  
+  # IM
+  s.dependency 'CNLiveIMBaseSDK'
+  
+  # 类别
+  s.dependency 'CNLiveCategory'
+  
   # 用户信息本地化
   s.dependency 'CNLiveUserManagement'
  
@@ -98,11 +104,8 @@ TODO: 网家家-我的模块.
   # 设置模块
   s.dependency 'CNLiveSettingModule'
  
-  #IM
-  s.dependency 'CNLiveIMBaseSDK'
-  
-  #类别
-  s.dependency 'CNLiveCategory'
+  # 我的收藏模块
+  s.dependency 'CNLiveCollectionModule'
  
   s.static_framework = true
  
@@ -22,6 +22,7 @@
 #import "CNLiveMineCell.h"
 #import "CNLiveMineModel.h"
 #import "CNLiveUserInfoController.h"
+#import "CNLiveMineRequest.h"
  
 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
 @property (nonatomic, strong) UITableView *tableView;
@@ -60,7 +61,8 @@ static const CGFloat timeValue = 1.5;
                                            @"image":@"mine_refund"
                            }
                           ]
-                          },
+                          
+                      },
                       @{
                           @"name":@"常用工具",
                           @"style":@"2",
@@ -94,7 +96,8 @@ static const CGFloat timeValue = 1.5;
                                            @"image":@"mine_tool_map"
                            }
                           ]
-                          },
+                          
+                      },
                       @{
                           @"name":@"购买的商品",
                           @"pic":@"mine_buy_commodity",
@@ -105,7 +108,8 @@ static const CGFloat timeValue = 1.5;
                                            @"image":@"mine_e-ticket"
                           }
                           ]
-                          },
+                          
+                      },
                       @{
                           @"name":@"大众体育",
                           @"pic":@"mine_china_sport",
@@ -119,11 +123,12 @@ static const CGFloat timeValue = 1.5;
                                            @"image":@"mine_record"
                           }
                           ]
-                          }
+                          
+                      }
                       ];
     for(NSDictionary *dic in data){
         CNLiveMineModel *model = [CNLiveMineModel mj_objectWithKeyValues:dic];
-//        [model editModel:NO];
+        [model editModel:NO];
         [self.data addObject:model];
     }
     [self.tableView reloadData];
@@ -223,35 +228,27 @@ static const CGFloat timeValue = 1.5;
     }
 }
  
+// 请求签到赚积分
 - (void)requestSignIn{
-    NSDictionary *params = @{@"sid":CNUserShareModel.uid};
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNIntegralSignInUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-
+    [CNLiveMineRequest signIn:^(BOOL isSuccess, NSDictionary * _Nonnull data, NSError * _Nonnull error) {
         if (error.code == -1001 || error.code == -1009) {
             [QMUITips showError:@"网络连接已断开" inView:self.view hideAfterDelay:timeValue];
             return ;
         }
-        if (!error) {
-            if(responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]){
-                id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
-                NSDictionary *dic = responseObject[@"data"];
-                NSInteger status = [dic[@"status"] integerValue];
-                if (status == 1) {
-                    [service showGoldWhereaboutsViewWithDic:dic];
-                    
-                }else{
-                    [service showSignInViewWithDic:dic];
-                }
-                
+        if (isSuccess) {
+            id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
+            NSInteger status = [data[@"status"] integerValue];
+            if (status == 1) {
+                [service showGoldWhereaboutsViewWithDic:data];
+            }else{
+                [service showSignInViewWithDic:data];
             }
  
         }else{
             [QMUITips showError:@"签到失败" inView:self.view hideAfterDelay:timeValue];
-            return ;
  
         }
-
+        self.headerView.interactionEnabled = YES;
     }];
 }
  
@@ -36,6 +36,7 @@ typedef NS_ENUM(NSInteger, CNLiveMineCellType) {
 @property (nonatomic, assign) CGFloat height;
 @property (nonatomic, assign) CGFloat margin;
  
+// 是否显示路径工具
 - (void)editModel:(BOOL)showMapTool;
  
 @end
+//
+//  CNLiveMineRequest.h
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+typedef void(^CancelCollectionBlock)(BOOL isSuccess, NSDictionary *data, NSError *error);
+
+@interface CNLiveMineRequest : NSObject
+
++ (void)signIn:(CancelCollectionBlock)block;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveMineRequest.m
+//  CNLiveMineModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveMineRequest.h"
+#import "CNLiveCategory.h"
+#import "CNLiveNetworking.h"
+#import "CNLiveEnvironment.h"
+#import "CNUserInfoManager.h"
+
+#import "CNLiveCollectionModel.h"
+
+@implementation CNLiveMineRequest
+
++ (void)signIn:(CancelCollectionBlock)block {
+    NSDictionary *params = @{@"sid":CNUserShareModel.uid};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNIntegralSignInUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (responseObject && [responseObject isKindOfClass:[NSDictionary class]] && responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
+            NSString *errorCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
+            NSDictionary *data = responseObject[@"data"];
+            block?block([errorCode isEqualToString:@"0"], data, error):@"";
+        }else{
+            block?block(NO, @{}, error):@"";
+
+        }
+
+    }];
+}
+
+
+@end
@@ -25,6 +25,8 @@ typedef NS_ENUM(NSInteger, CNLiveMineHeaderViewType) {
 @end
 @interface CNLiveMineHeaderView : UIView
 @property (nonatomic, weak) id<CNLiveMineHeaderViewDelegate> delegate;
+@property (nonatomic, assign) BOOL interactionEnabled;
+
 - (void)layoutSubviews;
  
 @end
@@ -298,14 +298,24 @@ static const NSInteger margin = 20;
     }
  
 }
+
+- (void)setInteractionEnabled:(BOOL)interactionEnabled{
+    _interactionEnabled = interactionEnabled;
+    _sign.userInteractionEnabled = interactionEnabled;
+    _witness.userInteractionEnabled = interactionEnabled;
+
+}
+
 - (void)signDidClicked:(UIButton *)btn{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        btn.userInteractionEnabled = NO;
         [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeSign];
     }
 }
  
 - (void)witnessDidClicked:(UIButton *)btn{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        btn.userInteractionEnabled = NO;
         [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeWintess];
     }
 }
@@ -345,6 +345,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCollectionModule/CNLiveCollectionModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
@@ -392,6 +393,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCollectionModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
@@ -19,7 +19,7 @@
 {
     // Override point for customization after application launch.
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
     [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
      if ([CNUserShareManager isLogin]) {
          [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];