iOS Team / CNLiveMineModule · Commits

Commit 94161c92846bb19d20f018205fb2127452de1e51

Authored by zhangxiaowen
1 parent f3328157

no message

Inline Side-by-side
Showing 4 changed files with 25 additions and 2 deletions
CNLiveMineModule.podspec
  View file @94161c9
... ... @@ -78,5 +78,8 @@ TODO: 网家家-我的模块.
78 78  
79 79 # 用户信息本地化
80 80 s.dependency 'CNLiveUserManagement'
  81 +
  82 + # 二维码模块
  83 + s.dependency 'CNLiveQrCodeModule'
81 84  
82 85 end
... ...
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
  View file @94161c9
... ... @@ -17,6 +17,9 @@
17 17 #import "CNLiveMineModel.h"
18 18 #import "CNLiveUserInfoController.h"
19 19  
  20 +#import "CNLiveMyQrCodeController.h"
  21 +
  22 +
20 23 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
21 24 @property (nonatomic, strong) UITableView *tableView;
22 25 @property (nonatomic, weak) CNLiveMineHeaderView *headerView;
... ... @@ -146,8 +149,8 @@ static const NSInteger kHEIGHT = 250;
146 149 break;
147 150 case CNLiveMineHeaderViewTypeCode:
148 151 {
149   -// CNLiveMineQrCodeController *vc = [[CNLiveMineQrCodeController alloc]init];
150   -// [self.navigationController pushViewController:vc animated:YES];
  152 + CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc]init];
  153 + [self.navigationController pushViewController:vc animated:YES];
151 154 }
152 155 break;
153 156 case CNLiveMineHeaderViewTypeWintess:
... ...
Example/CNLiveMineModule.xcodeproj/project.pbxproj
  View file @94161c9
... ... @@ -329,23 +329,27 @@
329 329 "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh",
330 330 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
331 331 "${BUILT_PRODUCTS_DIR}/CNLiveMineModule/CNLiveMineModule.framework",
  332 + "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
332 333 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
333 334 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
334 335 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
335 336 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
336 337 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
337 338 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
  339 + "${BUILT_PRODUCTS_DIR}/SGQRCode/SGQRCode.framework",
338 340 );
339 341 name = "[CP] Embed Pods Frameworks";
340 342 outputPaths = (
341 343 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
342 344 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMineModule.framework",
  345 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
343 346 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
344 347 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
345 348 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
346 349 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
347 350 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
348 351 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
  352 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGQRCode.framework",
349 353 );
350 354 runOnlyForDeploymentPostprocessing = 0;
351 355 shellPath = /bin/sh;
... ...
Example/CNLiveMineModule/CNLiveMineModule-Info.plist
  View file @94161c9
... ... @@ -2,6 +2,19 @@
2 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3 <plist version="1.0">
4 4 <dict>
  5 + <key>NSAppTransportSecurity</key>
  6 + <dict>
  7 + <key>NSAllowsArbitraryLoads</key>
  8 + <true/>
  9 + </dict>
  10 + <key>NSCameraUsageDescription</key>
  11 + <string>App需要您的同意,才能访问相机</string>
  12 + <key>NSMicrophoneUsageDescription</key>
  13 + <string>App需要您的同意,才能访问麦克风</string>
  14 + <key>NSPhotoLibraryAddUsageDescription</key>
  15 + <string>App需要您的同意,才能访问相册</string>
  16 + <key>NSPhotoLibraryUsageDescription</key>
  17 + <string>App需要您的同意,才能访问相册</string>
5 18 <key>CFBundleDevelopmentRegion</key>
6 19 <string>en</string>
7 20 <key>CFBundleDisplayName</key>
... ...