iOS Team / CNLiveQrCodeModule · Commits

Commit 20f88a65da337ee163a148b514bb39696a6a74c1

Authored by zhangxiaowen
1 parent c184edab

no message

Inline Side-by-side
Showing 7 changed files with 17 additions and 5 deletions
CNLiveQrCodeModule.podspec
  View file @20f88a6
@@ -76,6 +76,9 @@ TODO: 网家家-二维码模块. @@ -76,6 +76,9 @@ TODO: 网家家-二维码模块.
76 # 服务层 76 # 服务层
77 s.dependency 'CNLiveServices' 77 s.dependency 'CNLiveServices'
78 78
  79 + # 基类
  80 + s.dependency 'CNLiveCommonClass'
  81 +
79 # 环境 82 # 环境
80 s.dependency 'CNLiveEnvironment' 83 s.dependency 'CNLiveEnvironment'
81 84
CNLiveQrCodeModule/Classes/Controller/CNLiveGenerateQrCodeController.h
  View file @20f88a6
@@ -11,10 +11,11 @@ @@ -11,10 +11,11 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
  14 +#import "CNCommonViewController.h"
14 15
15 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
16 17
17 -@interface CNLiveGenerateQrCodeController : UIViewController 18 +@interface CNLiveGenerateQrCodeController : CNCommonViewController
18 19
19 // ID 生成二维码的信息 20 // ID 生成二维码的信息
20 @property (nonatomic, copy) NSString *ID; 21 @property (nonatomic, copy) NSString *ID;
CNLiveQrCodeModule/Classes/Controller/CNLiveGroupQrCodeController.h
  View file @20f88a6
@@ -11,11 +11,12 @@ @@ -11,11 +11,12 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
  14 +#import "CNCommonViewController.h"
14 15
15 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
16 @class IMAGroup; 17 @class IMAGroup;
17 18
18 -@interface CNLiveGroupQrCodeController : UIViewController 19 +@interface CNLiveGroupQrCodeController : CNCommonViewController
19 @property (nonatomic, strong) IMAGroup *group; 20 @property (nonatomic, strong) IMAGroup *group;
20 21
21 @end 22 @end
CNLiveQrCodeModule/Classes/Controller/CNLiveMyQrCodeController.h
  View file @20f88a6
@@ -11,10 +11,11 @@ @@ -11,10 +11,11 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
  14 +#import "CNCommonViewController.h"
14 15
15 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
16 17
17 -@interface CNLiveMyQrCodeController : UIViewController 18 +@interface CNLiveMyQrCodeController : CNCommonViewController
18 @property (nonatomic, assign) BOOL isScanCode; 19 @property (nonatomic, assign) BOOL isScanCode;
19 20
20 @end 21 @end
CNLiveQrCodeModule/Classes/Controller/CNLiveScanQrCodeController.h
  View file @20f88a6
@@ -11,10 +11,11 @@ @@ -11,10 +11,11 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
  14 +#import "CNCommonViewController.h"
14 15
15 NS_ASSUME_NONNULL_BEGIN 16 NS_ASSUME_NONNULL_BEGIN
16 17
17 -@interface CNLiveScanQrCodeController : UIViewController 18 +@interface CNLiveScanQrCodeController : CNCommonViewController
18 @property (nonatomic, assign) BOOL isMyCode; 19 @property (nonatomic, assign) BOOL isMyCode;
19 20
20 @end 21 @end
CNLiveQrCodeModule/Classes/Controller/CNLiveScanResultController.h
  View file @20f88a6
@@ -11,8 +11,9 @@ @@ -11,8 +11,9 @@
11 */ 11 */
12 12
13 #import <UIKit/UIKit.h> 13 #import <UIKit/UIKit.h>
  14 +#import "CNCommonViewController.h"
14 15
15 -@interface CNLiveScanResultController : UIViewController 16 +@interface CNLiveScanResultController : CNCommonViewController
16 /** 是否返回到Root */ 17 /** 是否返回到Root */
17 @property (nonatomic, assign) BOOL isPopToRoot; 18 @property (nonatomic, assign) BOOL isPopToRoot;
18 @property (nonatomic, copy) NSString *jump_URL; 19 @property (nonatomic, copy) NSString *jump_URL;
Example/CNLiveQrCodeModule.xcodeproj/project.pbxproj
  View file @20f88a6
@@ -350,8 +350,10 @@ @@ -350,8 +350,10 @@
350 inputPaths = ( 350 inputPaths = (
351 "${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-frameworks.sh", 351 "${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-frameworks.sh",
352 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", 352 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
  353 + "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
353 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 354 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
354 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", 355 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
  356 + "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
355 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 357 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
356 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", 358 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
357 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework", 359 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
@@ -367,8 +369,10 @@ @@ -367,8 +369,10 @@
367 name = "[CP] Embed Pods Frameworks"; 369 name = "[CP] Embed Pods Frameworks";
368 outputPaths = ( 370 outputPaths = (
369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", 371 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
  372 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 373 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
371 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", 374 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
  375 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
372 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 376 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
373 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", 377 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
374 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework", 378 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",