iOS Team / CNLiveSettingModule · Commits

Commit e37a570a3b962e6ebd56ed991ed463b4e60a19bc

Authored by zhangxiaowen
1 parent a9ffb323

no message

Inline Side-by-side
Showing 27 changed files with 226 additions and 3 deletions
CNLiveSettingModule.podspec
  View file @e37a570
@@ -41,6 +41,10 @@ TODO: 网家家-设置模块. @@ -41,6 +41,10 @@ TODO: 网家家-设置模块.
41 ss.source_files = 'CNLiveSettingModule/Classes/Controller/*.{h,m}' 41 ss.source_files = 'CNLiveSettingModule/Classes/Controller/*.{h,m}'
42 ss.dependency 'CNLiveSettingModule/View' 42 ss.dependency 'CNLiveSettingModule/View'
43 ss.dependency 'CNLiveSettingModule/Model' 43 ss.dependency 'CNLiveSettingModule/Model'
  44 + ss.dependency 'CNLiveSettingModule/Binding'
  45 + ss.dependency 'CNLiveSettingModule/Privacy'
  46 + ss.dependency 'CNLiveSettingModule/Cancellation'
  47 +
44 end 48 end
45 49
46 # View 50 # View
@@ -54,6 +58,23 @@ TODO: 网家家-设置模块. @@ -54,6 +58,23 @@ TODO: 网家家-设置模块.
54 ss.source_files = 'CNLiveSettingModule/Classes/Model/*.{h,m}' 58 ss.source_files = 'CNLiveSettingModule/Classes/Model/*.{h,m}'
55 end 59 end
56 60
  61 + # 绑定管理
  62 + s.subspec 'Binding' do |ss|
  63 + ss.source_files = 'CNLiveSettingModule/Classes/Binding/*.{h,m}'
  64 + end
  65 +
  66 + # 隐私
  67 + s.subspec 'Privacy' do |ss|
  68 + ss.source_files = 'CNLiveSettingModule/Classes/Privacy/*.{h,m}'
  69 + end
  70 +
  71 + # 注销
  72 + s.subspec 'Cancellation' do |ss|
  73 + ss.source_files = 'CNLiveSettingModule/Classes/Cancellation/*.{h,m}'
  74 + # 用户协议
  75 + ss.dependency 'CNLiveUserAgreementManager'
  76 + end
  77 +
57 s.resource_bundles = { 78 s.resource_bundles = {
58 'CNLiveSettingModule' => ['CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets'] 79 'CNLiveSettingModule' => ['CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets']
59 } 80 }
@@ -67,10 +88,17 @@ TODO: 网家家-设置模块. @@ -67,10 +88,17 @@ TODO: 网家家-设置模块.
67 s.dependency 'CNLiveTripartiteManagement/SDWebImage' 88 s.dependency 'CNLiveTripartiteManagement/SDWebImage'
68 s.dependency 'CNLiveTripartiteManagement/Masonry' 89 s.dependency 'CNLiveTripartiteManagement/Masonry'
69 s.dependency 'CNLiveTripartiteManagement/MJExtension' 90 s.dependency 'CNLiveTripartiteManagement/MJExtension'
  91 + s.dependency 'CNLiveTripartiteManagement/YYKit'
70 92
71 # 服务层 93 # 服务层
72 s.dependency 'CNLiveServices' 94 s.dependency 'CNLiveServices'
73 95
  96 + #环境库
  97 + s.dependency 'CNLiveEnvironment'
  98 +
  99 + # 数据请求
  100 + s.dependency 'CNLiveRequestBastKit'
  101 +
74 # 用户信息本地化 102 # 用户信息本地化
75 s.dependency 'CNLiveUserManagement' 103 s.dependency 'CNLiveUserManagement'
76 104
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/cancellation_agree.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cancellation_agree@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cancellation_agree@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/cancellation_agree.imageset/cancellation_agree@2x.png 0 → 100644
View file @e37a570

331 Bytes
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/cancellation_agree.imageset/cancellation_agree@3x.png 0 → 100644
View file @e37a570

709 Bytes
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/cancellation_agree_sel.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cancellation_agree_sel@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cancellation_agree_sel@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/cancellation_agree_sel.imageset/cancellation_agree_sel@2x.png 0 → 100644
View file @e37a570

757 Bytes
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/cancellation_agree_sel.imageset/cancellation_agree_sel@3x.png 0 → 100644
View file @e37a570

1.46 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_edit_minus.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "privacy_edit_minus@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "privacy_edit_minus@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_edit_minus.imageset/privacy_edit_minus@2x.png 0 → 100644
View file @e37a570

590 Bytes
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_edit_minus.imageset/privacy_edit_minus@3x.png 0 → 100644
View file @e37a570

983 Bytes
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_edit_no.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "privacy_edit_no@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "privacy_edit_no@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_edit_no.imageset/privacy_edit_no@2x.png 0 → 100644
View file @e37a570

1.12 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_edit_no.imageset/privacy_edit_no@3x.png 0 → 100644
View file @e37a570

2.91 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_less.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "privacy_less@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "privacy_less@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_less.imageset/privacy_less@2x.png 0 → 100644
View file @e37a570

3.6 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_less.imageset/privacy_less@3x.png 0 → 100644
View file @e37a570

7.7 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_plus.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "privacy_plus@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "privacy_plus@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_plus.imageset/privacy_plus@2x.png 0 → 100644
View file @e37a570

3.89 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_plus.imageset/privacy_plus@3x.png 0 → 100644
View file @e37a570

8.08 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_sel_no.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "privacy_sel_no@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "privacy_sel_no@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_sel_no.imageset/privacy_sel_no@2x.png 0 → 100644
View file @e37a570

1.04 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_sel_no.imageset/privacy_sel_no@3x.png 0 → 100644
View file @e37a570

1.93 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_sel_yes.imageset/Contents.json 0 → 100644
  View file @e37a570
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "privacy_sel_yes@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "privacy_sel_yes@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_sel_yes.imageset/privacy_sel_yes@2x.png 0 → 100644
View file @e37a570

1.51 KB
CNLiveSettingModule/Assets/CNLiveSettingModule.xcassets/privacy_sel_yes.imageset/privacy_sel_yes@3x.png 0 → 100644
View file @e37a570

3.92 KB
CNLiveSettingModule/Classes/Controller/CNLiveSettingController.m
  View file @e37a570
@@ -16,6 +16,9 @@ @@ -16,6 +16,9 @@
16 #import "CNLiveServices.h" 16 #import "CNLiveServices.h"
17 #import "CNLiveSettingNavigationBar.h" 17 #import "CNLiveSettingNavigationBar.h"
18 18
  19 +#import "CNLivePrivacyController.h"//隐私
  20 +#import "CNLiveCancellationController.h"//注销
  21 +
19 @interface CNLiveSettingController () 22 @interface CNLiveSettingController ()
20 <UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate> 23 <UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
21 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar; 24 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
@@ -192,7 +195,8 @@ static const NSInteger timeValue = 1.5; @@ -192,7 +195,8 @@ static const NSInteger timeValue = 1.5;
192 195
193 } 196 }
194 else if(indexPath.row == 5){ // 隐私 197 else if(indexPath.row == 5){ // 隐私
195 - 198 + CNLivePrivacyController *vc = [[CNLivePrivacyController alloc]init];
  199 + [self.navigationController pushViewController:vc animated:YES];
196 } 200 }
197 else if(indexPath.row == 6){ //音量开关 201 else if(indexPath.row == 6){ //音量开关
198 202
@@ -228,8 +232,13 @@ static const NSInteger timeValue = 1.5; @@ -228,8 +232,13 @@ static const NSInteger timeValue = 1.5;
228 232
229 [alertController showWithAnimated:YES]; 233 [alertController showWithAnimated:YES];
230 234
231 - }else{  
232 - 235 + }else if (indexPath.row == 8){
  236 + CNLivePrivacyController *vc = [[CNLivePrivacyController alloc]init];
  237 + [self.navigationController pushViewController:vc animated:YES];
  238 + }
  239 + else if (indexPath.row == 9) {
  240 + CNLiveCancellationController *vc = [[CNLiveCancellationController alloc]init];
  241 + [self.navigationController pushViewController:vc animated:YES];
233 } 242 }
234 } 243 }
235 244
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
  View file @e37a570
@@ -305,25 +305,35 @@ @@ -305,25 +305,35 @@
305 ); 305 );
306 inputPaths = ( 306 inputPaths = (
307 "${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh", 307 "${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh",
  308 + "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
308 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 309 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
  310 + "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  311 + "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
309 "${BUILT_PRODUCTS_DIR}/CNLiveSettingModule/CNLiveSettingModule.framework", 312 "${BUILT_PRODUCTS_DIR}/CNLiveSettingModule/CNLiveSettingModule.framework",
310 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", 313 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
  314 + "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
311 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 315 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
312 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 316 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
313 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 317 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
314 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 318 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
315 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 319 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
  320 + "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
316 ); 321 );
317 name = "[CP] Embed Pods Frameworks"; 322 name = "[CP] Embed Pods Frameworks";
318 outputPaths = ( 323 outputPaths = (
  324 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
319 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 325 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
  326 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  327 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
320 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveSettingModule.framework", 328 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveSettingModule.framework",
321 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", 329 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
  330 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
322 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 331 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
323 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 332 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
324 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 333 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
325 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 334 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
326 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 335 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
  336 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
327 ); 337 );
328 runOnlyForDeploymentPostprocessing = 0; 338 runOnlyForDeploymentPostprocessing = 0;
329 shellPath = /bin/sh; 339 shellPath = /bin/sh;