iOS Team / CNLiveQrCodeModule · Commits

Commit d9bba2724f0f58ba3380d29a960442953abfd4d3

Authored by zhangxiaowen
1 parent b67717a8

no message

Inline Side-by-side
Showing 3 changed files with 13 additions and 5 deletions
CNLiveQrCodeModule.podspec
  View file @d9bba27
@@ -84,5 +84,8 @@ TODO: 网家家-二维码模块. @@ -84,5 +84,8 @@ TODO: 网家家-二维码模块.
84 84
85 # 用户信息本地化 85 # 用户信息本地化
86 s.dependency 'CNLiveUserManagement' 86 s.dependency 'CNLiveUserManagement'
87 - 87 +
  88 + # 管理类
  89 + s.dependency 'CNLiveManager'
  90 +
88 end 91 end
CNLiveQrCodeModule/Classes/Module/CNLiveQrCodeService.m
  View file @d9bba27
@@ -8,6 +8,9 @@ @@ -8,6 +8,9 @@
8 8
9 #import "CNLiveQrCodeService.h" 9 #import "CNLiveQrCodeService.h"
10 #import "CNLiveServices.h" 10 #import "CNLiveServices.h"
  11 +
  12 +#import "CNLiveManager.h"
  13 +
11 // 扫一扫 14 // 扫一扫
12 #import "CNLiveScanQrCodeController.h" 15 #import "CNLiveScanQrCodeController.h"
13 // 我的二维码 16 // 我的二维码
@@ -32,7 +35,7 @@ @@ -32,7 +35,7 @@
32 - (void)pushToSweepQrCodeController:(BOOL)isMyCode { 35 - (void)pushToSweepQrCodeController:(BOOL)isMyCode {
33 CNLiveScanQrCodeController *vc = [[CNLiveScanQrCodeController alloc]init]; 36 CNLiveScanQrCodeController *vc = [[CNLiveScanQrCodeController alloc]init];
34 vc.isMyCode = isMyCode; 37 vc.isMyCode = isMyCode;
35 -// [CNLivePageJumpManager pushViewController:vc]; 38 + [CNLivePageJumpManager jumpViewController:vc];
36 } 39 }
37 40
38 // 我的二维码 41 // 我的二维码
@@ -43,7 +46,7 @@ @@ -43,7 +46,7 @@
43 - (void)pushToMyQrCodeController:(BOOL)isScanCode { 46 - (void)pushToMyQrCodeController:(BOOL)isScanCode {
44 CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc]init]; 47 CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc]init];
45 vc.isScanCode = isScanCode; 48 vc.isScanCode = isScanCode;
46 -// [CNLivePageJumpManager pushViewController:vc]; 49 + [CNLivePageJumpManager jumpViewController:vc];
47 } 50 }
48 51
49 // 群组二维码 52 // 群组二维码
@@ -53,7 +56,7 @@ @@ -53,7 +56,7 @@
53 56
54 - (void)pushToGroupQrCodeController { 57 - (void)pushToGroupQrCodeController {
55 CNLiveGroupQrCodeController *vc = [[CNLiveGroupQrCodeController alloc]init]; 58 CNLiveGroupQrCodeController *vc = [[CNLiveGroupQrCodeController alloc]init];
56 -// [CNLivePageJumpManager pushViewController:vc]; 59 + [CNLivePageJumpManager jumpViewController:vc];
57 } 60 }
58 61
59 // 生成二维码 62 // 生成二维码
@@ -64,7 +67,7 @@ @@ -64,7 +67,7 @@
64 - (void)pushToGenerateQrCodeController:(NSString *)ID { 67 - (void)pushToGenerateQrCodeController:(NSString *)ID {
65 CNLiveGenerateQrCodeController *vc = [[CNLiveGenerateQrCodeController alloc]init]; 68 CNLiveGenerateQrCodeController *vc = [[CNLiveGenerateQrCodeController alloc]init];
66 vc.ID = ID; 69 vc.ID = ID;
67 -// [CNLivePageJumpManager pushViewController:vc]; 70 + [CNLivePageJumpManager jumpViewController:vc];
68 } 71 }
69 72
70 @end 73 @end
Example/CNLiveQrCodeModule.xcodeproj/project.pbxproj
  View file @d9bba27
@@ -352,6 +352,7 @@ @@ -352,6 +352,7 @@
352 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", 352 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
353 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 353 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
354 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 354 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  355 + "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
355 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework", 356 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
356 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 357 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
357 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", 358 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
@@ -367,6 +368,7 @@ @@ -367,6 +368,7 @@
367 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", 368 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
368 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  371 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework", 372 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
371 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 373 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
372 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", 374 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",