Commit 2783fceaf6c2b5e44f585a84187a94c7bb2afe21

Authored by zhangxiaowen
1 parent f931ae9f

no message

CNLiveMineModule/Classes/Controller/CNLiveMineController.m
@@ -162,7 +162,7 @@ static const NSInteger kHEIGHT = 250; @@ -162,7 +162,7 @@ static const NSInteger kHEIGHT = 250;
162 case CNLiveMineHeaderViewTypeSign: 162 case CNLiveMineHeaderViewTypeSign:
163 { 163 {
164 id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)]; 164 id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
165 - [service showSignInViewWithScore:@"100" scores:@"" day:2 url:@"http://www.baidu.com"]; 165 + [service showSignInViewWithScore:@"100" scores:@"" day:1 url:@"http://www.baidu.com"];
166 } 166 }
167 break; 167 break;
168 case CNLiveMineHeaderViewTypeWintess: 168 case CNLiveMineHeaderViewTypeWintess:
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
10 #import "QMUIKit.h" 10 #import "QMUIKit.h"
11 #import <SDWebImage/SDWebImage.h> 11 #import <SDWebImage/SDWebImage.h>
12 12
  13 +#import "CNUserInfoManager.h"
  14 +
13 #import "CNLiveUserInfoModel.h" 15 #import "CNLiveUserInfoModel.h"
14 #import "CNLiveUserInfoNotification.h" 16 #import "CNLiveUserInfoNotification.h"
15 #import "CNLiveUserInfoNavigationBar.h" 17 #import "CNLiveUserInfoNavigationBar.h"
@@ -110,7 +112,7 @@ static const CGFloat timeValue = 1.5; @@ -110,7 +112,7 @@ static const CGFloat timeValue = 1.5;
110 imageView.center = self.view.center; 112 imageView.center = self.view.center;
111 imageView.backgroundColor = [UIColor whiteColor];// 设置背景颜色 113 imageView.backgroundColor = [UIColor whiteColor];// 设置背景颜色
112 UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]]; 114 UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]];
113 - [imageView sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image]; 115 + [imageView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.bigFaceUrl?CNUserShareModel.bigFaceUrl:CNUserShareModel.faceUrl] placeholderImage:xw_image];
114 [self.view addSubview:imageView]; 116 [self.view addSubview:imageView];
115 self.imageView = imageView; 117 self.imageView = imageView;
116 118
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
11 #import <SDWebImage/SDWebImage.h> 11 #import <SDWebImage/SDWebImage.h>
12 #import "QMUIKit.h" 12 #import "QMUIKit.h"
13 13
  14 +#import "CNUserInfoManager.h"
  15 +
14 @interface CNLiveMineHeaderView () 16 @interface CNLiveMineHeaderView ()
15 @property (nonatomic, strong) UIImageView *bgView; 17 @property (nonatomic, strong) UIImageView *bgView;
16 @property (nonatomic, strong) UIButton *witness; 18 @property (nonatomic, strong) UIButton *witness;
@@ -219,7 +221,7 @@ static const NSInteger margin = 20; @@ -219,7 +221,7 @@ static const NSInteger margin = 20;
219 _header.layer.masksToBounds = YES; 221 _header.layer.masksToBounds = YES;
220 _header.layer.cornerRadius = 30; 222 _header.layer.cornerRadius = 30;
221 UIImage *xw_image = [self xw_getImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]]; 223 UIImage *xw_image = [self xw_getImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
222 - [_header sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image]; 224 + [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
223 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)]; 225 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)];
224 [_header addGestureRecognizer:tap]; 226 [_header addGestureRecognizer:tap];
225 } 227 }
@@ -256,7 +258,7 @@ static const NSInteger margin = 20; @@ -256,7 +258,7 @@ static const NSInteger margin = 20;
256 _address.numberOfLines = 1; 258 _address.numberOfLines = 1;
257 _address.textColor = [UIColor colorWithRed:140/255.0 green:140/255.0 blue:142/255.0 alpha:1.0]; 259 _address.textColor = [UIColor colorWithRed:140/255.0 green:140/255.0 blue:142/255.0 alpha:1.0];
258 _address.font = [UIFont systemFontOfSize:13]; 260 _address.font = [UIFont systemFontOfSize:13];
259 - _address.attributedText = [self createAttributedImageName:@"mine_location" string:@"北京海淀区花园桥" isFront:YES]; 261 + _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location isFront:YES];
260 } 262 }
261 return _address; 263 return _address;
262 } 264 }
Example/CNLiveMineModule.xcodeproj/project.pbxproj
@@ -329,45 +329,65 @@ @@ -329,45 +329,65 @@
329 inputPaths = ( 329 inputPaths = (
330 "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh", 330 "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh",
331 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", 331 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
  332 + "${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
332 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", 333 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
  334 + "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
333 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 335 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
  336 + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
334 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", 337 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
335 "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework", 338 "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
336 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 339 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  340 + "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
337 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework", 341 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework",
338 "${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework", 342 "${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework",
  343 + "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
339 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 344 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
340 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", 345 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
  346 + "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
341 "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework", 347 "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
342 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 348 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
  349 + "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
343 "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework", 350 "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
344 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 351 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
345 "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", 352 "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
346 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 353 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
347 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 354 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
  355 + "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
  356 + "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
348 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 357 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
  358 + "${BUILT_PRODUCTS_DIR}/SGQRCode/SGQRCode.framework",
349 "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", 359 "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
350 ); 360 );
351 name = "[CP] Embed Pods Frameworks"; 361 name = "[CP] Embed Pods Frameworks";
352 outputPaths = ( 362 outputPaths = (
353 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", 363 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
  364 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", 365 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
  366 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
355 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 367 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
  368 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", 369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
357 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework", 370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 371 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  372 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
359 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework", 373 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework",
360 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework", 374 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework",
  375 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
361 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 376 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
362 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", 377 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
  378 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
363 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework", 379 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
364 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 380 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
  381 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
365 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework", 382 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
366 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 383 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
367 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", 384 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
368 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 386 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
  387 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
  388 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
  390 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGQRCode.framework",
371 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", 391 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
372 ); 392 );
373 runOnlyForDeploymentPostprocessing = 0; 393 runOnlyForDeploymentPostprocessing = 0;
@@ -383,10 +403,12 @@ @@ -383,10 +403,12 @@
383 inputPaths = ( 403 inputPaths = (
384 "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh", 404 "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
385 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle", 405 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
  406 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
386 ); 407 );
387 name = "[CP] Copy Pods Resources"; 408 name = "[CP] Copy Pods Resources";
388 outputPaths = ( 409 outputPaths = (
389 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle", 410 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
  411 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
390 ); 412 );
391 runOnlyForDeploymentPostprocessing = 0; 413 runOnlyForDeploymentPostprocessing = 0;
392 shellPath = /bin/sh; 414 shellPath = /bin/sh;
Example/CNLiveMineModule/CNLIVEAppDelegate.m
@@ -9,17 +9,39 @@ @@ -9,17 +9,39 @@
9 #import "CNLIVEAppDelegate.h" 9 #import "CNLIVEAppDelegate.h"
10 #import "CNLiveMineController.h" 10 #import "CNLiveMineController.h"
11 #import "CNLiveGoldWhereaboutsView.h" 11 #import "CNLiveGoldWhereaboutsView.h"
  12 +#import "CNUserInfoManager.h"
12 13
13 @implementation CNLIVEAppDelegate 14 @implementation CNLIVEAppDelegate
14 15
15 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions 16 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
16 { 17 {
17 // Override point for customization after application launch. 18 // Override point for customization after application launch.
18 - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; 19 + self.window =[[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
19 CNLiveMineController *vc = [[CNLiveMineController alloc] init]; 20 CNLiveMineController *vc = [[CNLiveMineController alloc] init];
20 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc]; 21 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
21 self.window.rootViewController = nav;//设置根视图控制器 22 self.window.rootViewController = nav;//设置根视图控制器
22 [self.window makeKeyAndVisible]; 23 [self.window makeKeyAndVisible];
  24 +
  25 + [CNUserInfoManager saveUserinfoDic:@{
  26 + @"bigFaceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697.jpg",
  27 + @"countryCode":@"86",
  28 + @"email":@"",
  29 + @"extInfo":@"",
  30 + @"faceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697_small.jpg",
  31 + @"gender":@"m",
  32 + @"hUid":@"",
  33 + @"isNewUser":@"0",
  34 + @"location":@"北京市海淀区",
  35 + @"mobile":@"17600922519",
  36 + @"nickName":@"金帝",
  37 + @"platformId":@"769_jetj7bq525",
  38 + @"qqUid":@"",
  39 + @"renrenUid":@"",
  40 + @"sinaUid":@"",
  41 + @"token":@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj",
  42 + @"uid":@"10514405",
  43 + @"wxUid":@""
  44 + }];
23 return YES; 45 return YES;
24 } 46 }
25 47