Commit d69b2e8f9a02618b97b43a2feec83f11bdc64241
1 parent
97235654
no message
Showing
3 changed files
with
21 additions
and
8 deletions
CNLiveBMineModule.podspec
| @@ -103,13 +103,26 @@ TODO: 网家家企业版-我的模块. | @@ -103,13 +103,26 @@ TODO: 网家家企业版-我的模块. | ||
| 103 | # 分享工具库 | 103 | # 分享工具库 |
| 104 | s.dependency 'CNLiveShareToolKit' | 104 | s.dependency 'CNLiveShareToolKit' |
| 105 | 105 | ||
| 106 | - s.dependency 'CNLiveCommonCategory' | 106 | + # 用户协议 |
| 107 | + s.dependency 'CNLiveBUserAgreement' | ||
| 108 | + | ||
| 109 | + # 切换国家 | ||
| 110 | + s.dependency 'CNLiveChooseCountry' | ||
| 111 | + | ||
| 112 | + # 自定义组件 | ||
| 107 | s.dependency 'CNLiveCustomControl' | 113 | s.dependency 'CNLiveCustomControl' |
| 114 | + | ||
| 115 | + # 管理类 | ||
| 108 | s.dependency 'CNLiveManager' | 116 | s.dependency 'CNLiveManager' |
| 117 | + | ||
| 118 | + # 分类 | ||
| 119 | + s.dependency 'CNLiveCommonCategory' | ||
| 120 | + | ||
| 121 | + # 相册 | ||
| 109 | s.dependency 'CNLiveImagePickerController' | 122 | s.dependency 'CNLiveImagePickerController' |
| 123 | + | ||
| 124 | + # 相册 | ||
| 110 | s.dependency 'CNLiveAVCamera' | 125 | s.dependency 'CNLiveAVCamera' |
| 111 | - s.dependency 'CNLiveUserAgreementManager' | ||
| 112 | - s.dependency 'CNLiveChooseCountry' | ||
| 113 | 126 | ||
| 114 | s.static_framework = true | 127 | s.static_framework = true |
| 115 | s.xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' } | 128 | s.xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' } |
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.m
| @@ -157,7 +157,7 @@ static const NSInteger timeValue = 1.5; | @@ -157,7 +157,7 @@ static const NSInteger timeValue = 1.5; | ||
| 157 | 157 | ||
| 158 | - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ | 158 | - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ |
| 159 | if(indexPath.row == 0){ // 给软件评分 | 159 | if(indexPath.row == 0){ // 给软件评分 |
| 160 | - NSString *app = [NSString stringWithFormat:@"https://itunes.apple.com/app/apple-store/id%@?ct=web&mt=8",@"1337575478"]; | 160 | + NSString *app = [NSString stringWithFormat:@"https://itunes.apple.com/app/apple-store/id%@?ct=web&mt=8",@"1505450158"]; |
| 161 | if (@available(iOS 10.0, *)) { | 161 | if (@available(iOS 10.0, *)) { |
| 162 | [[UIApplication sharedApplication] openURL:[NSURL URLWithString:app] options:@{} completionHandler:nil]; | 162 | [[UIApplication sharedApplication] openURL:[NSURL URLWithString:app] options:@{} completionHandler:nil]; |
| 163 | } else { | 163 | } else { |
| @@ -177,11 +177,11 @@ static const NSInteger timeValue = 1.5; | @@ -177,11 +177,11 @@ static const NSInteger timeValue = 1.5; | ||
| 177 | [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementPermission]; | 177 | [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementPermission]; |
| 178 | } | 178 | } |
| 179 | else if(indexPath.row == 4){ // 版权信息 | 179 | else if(indexPath.row == 4){ // 版权信息 |
| 180 | - [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCopyright]; | 180 | +// [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCopyright]; |
| 181 | 181 | ||
| 182 | } | 182 | } |
| 183 | else if(indexPath.row == 5){ // 资质信息 | 183 | else if(indexPath.row == 5){ // 资质信息 |
| 184 | - [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementEnterpriseQualification]; | 184 | + [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementQualificationInfo]; |
| 185 | } | 185 | } |
| 186 | else if(indexPath.row == 6){ // 当前版本 | 186 | else if(indexPath.row == 6){ // 当前版本 |
| 187 | 187 |
Example/CNLiveBMineModule.xcodeproj/project.pbxproj
| @@ -307,15 +307,15 @@ | @@ -307,15 +307,15 @@ | ||
| 307 | inputPaths = ( | 307 | inputPaths = ( |
| 308 | "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh", | 308 | "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh", |
| 309 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle", | 309 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle", |
| 310 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBUserAgreement/CNLiveBUserAgreement.bundle", | ||
| 310 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", | 311 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", |
| 311 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.bundle", | ||
| 312 | "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", | 312 | "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", |
| 313 | ); | 313 | ); |
| 314 | name = "[CP] Copy Pods Resources"; | 314 | name = "[CP] Copy Pods Resources"; |
| 315 | outputPaths = ( | 315 | outputPaths = ( |
| 316 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle", | 316 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle", |
| 317 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBUserAgreement.bundle", | ||
| 317 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", | 318 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", |
| 318 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveUserAgreementManager.bundle", | ||
| 319 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", | 319 | "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", |
| 320 | ); | 320 | ); |
| 321 | runOnlyForDeploymentPostprocessing = 0; | 321 | runOnlyForDeploymentPostprocessing = 0; |