no message

zhangxiaowen
1 parent 04ee37bb
Showing 4 changed files with 74 additions and 74 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/Model/CNLiveMineRequest.h
CNLiveMineModule/Classes/Model/CNLiveMineRequest.m
Example/CNLiveMineModule.xcodeproj/project.pbxproj
@@ -128,7 +128,7 @@ static const CGFloat timeValue = 1.5;
                       ];
     for(NSDictionary *dic in data){
         CNLiveMineModel *model = [CNLiveMineModel mj_objectWithKeyValues:dic];
-        [model editModel:NO];
+//        [model editModel:NO];
         [self.data addObject:model];
     }
     [self.tableView reloadData];
@@ -192,8 +192,7 @@ static const CGFloat timeValue = 1.5;
     CNLiveMineCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveMineCell];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     cell.delegate = self;
-    CNLiveMineModel *model = self.data[indexPath.row];
-    cell.model = model;
+    cell.model = self.data[indexPath.row];
     return cell;
 }
@@ -252,43 +251,6 @@ static const CGFloat timeValue = 1.5;
     }];
 }
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    CGPoint point = scrollView.contentOffset;
-    if (point.y < -kHEIGHT) {
-        CGRect rect = [self.tableView viewWithTag:666].frame;
-        rect.origin.y = point.y;
-        rect.size.height = -point.y;
-        [self.tableView viewWithTag:666].frame = rect;
-        if(point.y < -320){
-//            XWWitnessController *vc = [[XWWitnessController alloc]init];
-//            CATransition *transition = [CATransition animation];
-//            transition.duration = 0.5;
-//            transition.timingFunction = [CAMediaTimingFunction
-//                                         functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-//            transition.type = kCATransitionPush;
-//            transition.subtype = kCATransitionFromBottom;
-//            [self.view.window.layer addAnimation:transition forKey:nil];
-//            [self.navigationController pushViewController:vc animated:NO];
-
-        }
-    }
-   
-    CGFloat offsetToShow = 50.0;//滑动多少就完全显示
-    
-    CGFloat offsetY = scrollView.contentOffset.y+kHEIGHT;
-    if (offsetY <= 0) {
-        _navigationBar.alpha = 0.0;
-    }
-    else if (offsetY > offsetToShow) {
-        _navigationBar.alpha = 1.0;
-    }
-    else {
-        CGFloat alpha = MIN((offsetY / offsetToShow), 1);
-        _navigationBar.alpha = alpha;
-    }
-
-}
-
 #pragma mark - CNLiveMineCellDelegate
 - (void)cell:(CNLiveMineCell *)cell clickedButtonWithType:(CNLiveMineCellType)type tag:(NSInteger)tag{
     switch (type) {
@@ -378,10 +340,42 @@ static const CGFloat timeValue = 1.5;
 }
-#pragma mark - 响应方法
-- (void)soccerDidClicked:(UIButton *)btn{
-    id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
-    [service pushToTaskListViewController];
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    CGPoint point = scrollView.contentOffset;
+    if (point.y < -kHEIGHT) {
+        CGRect rect = [self.tableView viewWithTag:666].frame;
+        rect.origin.y = point.y;
+        rect.size.height = -point.y;
+        [self.tableView viewWithTag:666].frame = rect;
+        if(point.y < -320){
+//            XWWitnessController *vc = [[XWWitnessController alloc]init];
+//            CATransition *transition = [CATransition animation];
+//            transition.duration = 0.5;
+//            transition.timingFunction = [CAMediaTimingFunction
+//                                         functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+//            transition.type = kCATransitionPush;
+//            transition.subtype = kCATransitionFromBottom;
+//            [self.view.window.layer addAnimation:transition forKey:nil];
+//            [self.navigationController pushViewController:vc animated:NO];
+
+        }
+    }
+   
+    CGFloat offsetToShow = 50.0;//滑动多少就完全显示
+    
+    CGFloat offsetY = scrollView.contentOffset.y+kHEIGHT;
+    if (offsetY <= 0) {
+        _navigationBar.alpha = 0.0;
+    }
+    else if (offsetY > offsetToShow) {
+        _navigationBar.alpha = 1.0;
+    }
+    else {
+        CGFloat alpha = MIN((offsetY / offsetToShow), 1);
+        _navigationBar.alpha = alpha;
+    }
+
 }
 #pragma mark - 状态栏
@@ -396,6 +390,12 @@ static const CGFloat timeValue = 1.5;
 }
+#pragma mark - 响应方法
+- (void)soccerDidClicked:(UIButton *)btn{
+    id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
+    [service pushToTaskListViewController];
+}
+
 #pragma mark - 懒加载
 - (NSMutableArray *)data {
     if (!_data) {
@@ -9,11 +9,11 @@
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
-typedef void(^CancelCollectionBlock)(BOOL isSuccess, NSDictionary *data, NSError *error);
+typedef void(^SignInBlock)(BOOL isSuccess, NSDictionary *data, NSError *error);
 @interface CNLiveMineRequest : NSObject
-+ (void)signIn:(CancelCollectionBlock)block;
++ (void)signIn:(SignInBlock)block;
 @end
@@ -16,7 +16,7 @@
 @implementation CNLiveMineRequest
-+ (void)signIn:(CancelCollectionBlock)block {
++ (void)signIn:(SignInBlock)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) {
@@ -234,8 +234,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				179A773721B29DE922FE36E4 /* [CP] Embed Pods Frameworks */,
-				74528FB96C480F38FE82703E /* [CP] Copy Pods Resources */,
+				A2865851FA99976BFF15F3E3 /* [CP] Embed Pods Frameworks */,
+				1C17EACB5E5C91135706CC76 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -326,7 +326,31 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		179A773721B29DE922FE36E4 /* [CP] Embed Pods Frameworks */ = {
+		1C17EACB5E5C91135706CC76 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A2865851FA99976BFF15F3E3 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -432,30 +456,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		74528FB96C480F38FE82703E /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;