iOS Team / CNLiveLoginModule · Commits

Commit dac53124a7b886d08058704d66a113828c604074

Authored by zhangxiaowen
1 parent 3154e42d

no message

Inline Side-by-side
Showing 121 changed files with 126 additions and 464 deletions
CNLiveLoginModule.podspec
  View file @dac5312
@@ -35,16 +35,21 @@ TODO: 网家家-登录模块. @@ -35,16 +35,21 @@ TODO: 网家家-登录模块.
35 # Module 35 # Module
36 s.subspec 'Module' do |ss| 36 s.subspec 'Module' do |ss|
37 ss.source_files = 'CNLiveLoginModule/Classes/Module/*.{h,m}' 37 ss.source_files = 'CNLiveLoginModule/Classes/Module/*.{h,m}'
  38 + ss.dependency 'CNLiveLoginModule/Controller'
38 end 39 end
39 40
40 # Controller 41 # Controller
41 s.subspec 'Controller' do |ss| 42 s.subspec 'Controller' do |ss|
42 ss.source_files = 'CNLiveLoginModule/Classes/Controller/*.{h,m}' 43 ss.source_files = 'CNLiveLoginModule/Classes/Controller/*.{h,m}'
  44 + ss.dependency 'CNLiveLoginModule/View'
  45 + ss.dependency 'CNLiveLoginModule/Model'
  46 + ss.dependency 'CNLiveLoginModule/ThreeLogin'
43 end 47 end
44 48
45 # View 49 # View
46 s.subspec 'View' do |ss| 50 s.subspec 'View' do |ss|
47 ss.source_files = 'CNLiveLoginModule/Classes/View/*.{h,m}' 51 ss.source_files = 'CNLiveLoginModule/Classes/View/*.{h,m}'
  52 + ss.dependency 'CNLiveLoginModule/Model'
48 end 53 end
49 54
50 # Model 55 # Model
@@ -52,6 +57,10 @@ TODO: 网家家-登录模块. @@ -52,6 +57,10 @@ TODO: 网家家-登录模块.
52 ss.source_files = 'CNLiveLoginModule/Classes/Model/*.{h,m}' 57 ss.source_files = 'CNLiveLoginModule/Classes/Model/*.{h,m}'
53 end 58 end
54 59
  60 + s.subspec 'ThreeLogin' do |ss|
  61 + ss.source_files = 'CNLiveLoginModule/Classes/ThreeLogin/*.{h,m}'
  62 + end
  63 +
55 s.resource_bundles = { 64 s.resource_bundles = {
56 'CNLiveLoginModule' => ['CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets'] 65 'CNLiveLoginModule' => ['CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets']
57 } 66 }
@@ -63,6 +72,7 @@ TODO: 网家家-登录模块. @@ -63,6 +72,7 @@ TODO: 网家家-登录模块.
63 72
64 # pod 73 # pod
65 s.dependency 'CNLiveTripartiteManagement/QMUIKit' 74 s.dependency 'CNLiveTripartiteManagement/QMUIKit'
  75 + s.dependency 'CNLiveTripartiteManagement/YYKit'
66 s.dependency 'CNLiveTripartiteManagement/SDWebImage' 76 s.dependency 'CNLiveTripartiteManagement/SDWebImage'
67 s.dependency 'CNLiveTripartiteManagement/Masonry' 77 s.dependency 'CNLiveTripartiteManagement/Masonry'
68 s.dependency 'CNLiveTripartiteManagement/MJExtension' 78 s.dependency 'CNLiveTripartiteManagement/MJExtension'
@@ -70,6 +80,9 @@ TODO: 网家家-登录模块. @@ -70,6 +80,9 @@ TODO: 网家家-登录模块.
70 # 服务层 80 # 服务层
71 s.dependency 'CNLiveServices' 81 s.dependency 'CNLiveServices'
72 82
  83 + # 切换成城市
  84 + s.dependency 'CNLiveChooseCountry'
  85 +
73 # 用户信息本地化 86 # 用户信息本地化
74 s.dependency 'CNLiveUserManagement' 87 s.dependency 'CNLiveUserManagement'
75 88
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/code_refresh.imageset/code_refresh@2x.png deleted 100644 → 0
View file @3154e42

1.46 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/code_refresh.imageset/code_refresh@3x.png deleted 100644 → 0
View file @3154e42

2.57 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/default_avatar_f.imageset/default_avatar_f.png deleted 100644 → 0
View file @3154e42

11.1 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/default_avatar_y.imageset/default_avatar_y.png deleted 100644 → 0
View file @3154e42

10.7 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/flashlight_close.imageset/flashlight_close@2x.png deleted 100644 → 0
View file @3154e42

1.29 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/flashlight_close.imageset/flashlight_close@3x.png deleted 100644 → 0
View file @3154e42

1.41 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/flashlight_open.imageset/flashlight_open@2x.png deleted 100644 → 0
View file @3154e42

1.34 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/flashlight_open.imageset/flashlight_open@3x.png deleted 100644 → 0
View file @3154e42

1.52 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/flashlight_open.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_camera.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "flashlight_open@2x.png", 9 + "filename" : "login_camera@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "flashlight_open@3x.png", 14 + "filename" : "login_camera@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_camera.imageset/login_camera@2x.png 0 → 100644
View file @dac5312

12.7 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_camera.imageset/login_camera@3x.png 0 → 100644
View file @dac5312

27.3 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_back_white_b.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_country.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_back_white_b@2x.png", 9 + "filename" : "login_country@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_back_white_b@3x.png", 14 + "filename" : "login_country@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_country.imageset/login_country@2x.png 0 → 100644
View file @dac5312

219 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_country.imageset/login_country@3x.png 0 → 100644
View file @dac5312

423 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_bg.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_get_code.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_bg@2x.png", 9 + "filename" : "login_get_code@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_bg@3x.png", 14 + "filename" : "login_get_code@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_get_code.imageset/login_get_code@2x.png 0 → 100644
View file @dac5312

11 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_get_code.imageset/login_get_code@3x.png 0 → 100644
View file @dac5312

26 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_buy_commodity.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_logo.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_buy_commodity@2x.png", 9 + "filename" : "login_logo@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_buy_commodity@3x.png", 14 + "filename" : "login_logo@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_logo.imageset/login_logo@2x.png 0 → 100644
View file @dac5312

18.2 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_logo.imageset/login_logo@3x.png 0 → 100644
View file @dac5312

35.6 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_china_sport.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_qq.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_china_sport@2x.png", 9 + "filename" : "login_qq@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_china_sport@3x.png", 14 + "filename" : "login_qq@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_qq.imageset/login_qq@2x.png 0 → 100644
View file @dac5312

3.51 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_qq.imageset/login_qq@3x.png 0 → 100644
View file @dac5312

9.48 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_code.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_sel.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_code@2x.png", 9 + "filename" : "login_sel@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_code@3x.png", 14 + "filename" : "login_sel@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_sel.imageset/login_sel@2x.png 0 → 100644
View file @dac5312

1.29 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_sel.imageset/login_sel@3x.png 0 → 100644
View file @dac5312

1.81 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_code_more.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_wechat.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_code_more@2x.png", 9 + "filename" : "login_wechat@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_code_more@3x.png", 14 + "filename" : "login_wechat@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_wechat.imageset/login_wechat@2x.png 0 → 100644
View file @dac5312

4.2 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_wechat.imageset/login_wechat@3x.png 0 → 100644
View file @dac5312

11.2 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_common.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_weibo.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_common@2x.png", 9 + "filename" : "login_weibo@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_common@3x.png", 14 + "filename" : "login_weibo@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_weibo.imageset/login_weibo@2x.png 0 → 100644
View file @dac5312

9.14 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/login_weibo.imageset/login_weibo@3x.png 0 → 100644
View file @dac5312

18.7 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_activity.imageset/mine_activity@2x.png deleted 100644 → 0
View file @3154e42

2.73 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_activity.imageset/mine_activity@3x.png deleted 100644 → 0
View file @3154e42

6.3 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_address.imageset/mine_address@2x.png deleted 100644 → 0
View file @3154e42

2.89 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_address.imageset/mine_address@3x.png deleted 100644 → 0
View file @3154e42

5.49 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_back_white_b.imageset/mine_back_white_b@2x.png deleted 100644 → 0
View file @3154e42

2.03 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_back_white_b.imageset/mine_back_white_b@3x.png deleted 100644 → 0
View file @3154e42

2.28 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_bg.imageset/mine_bg@2x.png deleted 100644 → 0
View file @3154e42

25.9 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_bg.imageset/mine_bg@3x.png deleted 100644 → 0
View file @3154e42

50.7 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_buy_commodity.imageset/mine_buy_commodity@2x.png deleted 100644 → 0
View file @3154e42

1.71 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_buy_commodity.imageset/mine_buy_commodity@3x.png deleted 100644 → 0
View file @3154e42

3.16 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_card.imageset/mine_card@2x.png deleted 100644 → 0
View file @3154e42

2.48 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_card.imageset/mine_card@3x.png deleted 100644 → 0
View file @3154e42

4.57 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_china_sport.imageset/mine_china_sport@2x.png deleted 100644 → 0
View file @3154e42

2.83 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_china_sport.imageset/mine_china_sport@3x.png deleted 100644 → 0
View file @3154e42

6.34 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_code.imageset/mine_code@2x.png deleted 100644 → 0
View file @3154e42

1.06 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_code.imageset/mine_code@3x.png deleted 100644 → 0
View file @3154e42

2.03 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_code_more.imageset/mine_code_more@2x.png deleted 100644 → 0
View file @3154e42

205 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_code_more.imageset/mine_code_more@3x.png deleted 100644 → 0
View file @3154e42

962 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_common.imageset/mine_common@2x.png deleted 100644 → 0
View file @3154e42

2.14 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_common.imageset/mine_common@3x.png deleted 100644 → 0
View file @3154e42

4.11 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_e-ticket.imageset/mine_e-ticket@2x.png deleted 100644 → 0
View file @3154e42

5.94 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_e-ticket.imageset/mine_e-ticket@3x.png deleted 100644 → 0
View file @3154e42

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

2.09 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_evaluate.imageset/mine_evaluate@3x.png deleted 100644 → 0
View file @3154e42

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

266 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_front.imageset/mine_front@3x.png deleted 100644 → 0
View file @3154e42

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

2.6 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_invitation.imageset/mine_invitation@3x.png deleted 100644 → 0
View file @3154e42

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

2.51 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_like.imageset/mine_like@3x.png deleted 100644 → 0
View file @3154e42

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

767 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_location.imageset/mine_location@3x.png deleted 100644 → 0
View file @3154e42

1.47 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_observer.imageset/mine_observer@2x.png deleted 100644 → 0
View file @3154e42

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

623 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_order.imageset/mine_order@3x.png deleted 100644 → 0
View file @3154e42

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

1.91 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_overbadge.imageset/mine_overbadge@3x.png deleted 100644 → 0
View file @3154e42

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

732 Bytes
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_pending.imageset/mine_pending@3x.png deleted 100644 → 0
View file @3154e42

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

2.33 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_received.imageset/mine_received@3x.png deleted 100644 → 0
View file @3154e42

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

2.31 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_record.imageset/mine_record@3x.png deleted 100644 → 0
View file @3154e42

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

3.32 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_refund.imageset/mine_refund@3x.png deleted 100644 → 0
View file @3154e42

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

1.61 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_release.imageset/mine_release@3x.png deleted 100644 → 0
View file @3154e42

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

2.83 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_set.imageset/mine_set@3x.png deleted 100644 → 0
View file @3154e42

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

30 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_soccer_task.imageset/mine_soccer_task@3x.png deleted 100644 → 0
View file @3154e42

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

2.73 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_tool_map.imageset/mine_tool_map@3x.png deleted 100644 → 0
View file @3154e42

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

6.92 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_wjj_certification.imageset/mine_wjj_certification@3x.png deleted 100644 → 0
View file @3154e42

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

104 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/qr_code_bg.imageset/qr_code_bg@3x.png deleted 100644 → 0
View file @3154e42

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

1.57 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/qr_code_green.imageset/qr_code_green@3x.png deleted 100644 → 0
View file @3154e42

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

7.47 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/qr_code_icon.imageset/qr_code_icon@3x.png deleted 100644 → 0
View file @3154e42

11.1 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_e-ticket.imageset/Contents.json renamed to CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/select_country_close.imageset/Contents.json
  View file @dac5312
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "mine_e-ticket@2x.png", 9 + "filename" : "select_country_close@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "mine_e-ticket@3x.png", 14 + "filename" : "select_country_close@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/select_country_close.imageset/select_country_close@2x.png 0 → 100644
View file @dac5312

2.92 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/select_country_close.imageset/select_country_close@3x.png 0 → 100644
View file @dac5312

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

1.64 KB
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/sign_in_soccer.imageset/sign_in_soccer@3x.png deleted 100644 → 0
View file @3154e42

4.54 KB
CNLiveLoginModule/Classes/Controller/CNLiveLoginController.m
  View file @dac5312
@@ -10,15 +10,24 @@ @@ -10,15 +10,24 @@
10 10
11 #import "MJExtension.h" 11 #import "MJExtension.h"
12 #import "QMUIKit.h" 12 #import "QMUIKit.h"
  13 +#import "YYKit.h"
  14 +
  15 +#import "CNLiveLoginView.h"
  16 +#import "CNLiveThreeLoginView.h"
  17 +#import "CNLiveBindingTelController.h"//绑定手机号
  18 +//#import "XWAgreementManager.h"//协议
  19 +#import "CNLiveCompleteInfoController.h"//修改昵称
13 20
14 #define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0] 21 #define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
15 22
16 -@interface CNLiveLoginController() 23 +@interface CNLiveLoginController()<CNLiveLoginViewDelegate, CNLiveThreeLoginViewDelegate>
  24 +@property (nonatomic, weak) CNLiveLoginView *loginView;
  25 +@property (nonatomic, weak) CNLiveThreeLoginView *threeLoginView;
  26 +@property (nonatomic, weak) YYLabel *protocol;
17 27
18 @end 28 @end
19 29
20 @implementation CNLiveLoginController 30 @implementation CNLiveLoginController
21 -  
22 #pragma mark - 生命周期 31 #pragma mark - 生命周期
23 - (void)viewWillAppear:(BOOL)animated{ 32 - (void)viewWillAppear:(BOOL)animated{
24 [super viewWillAppear:animated]; 33 [super viewWillAppear:animated];
@@ -27,20 +36,96 @@ @@ -27,20 +36,96 @@
27 36
28 - (void)viewDidLoad { 37 - (void)viewDidLoad {
29 [super viewDidLoad]; 38 [super viewDidLoad];
30 - self.view.backgroundColor = HexColor(0xf4f4f4);  
31 - [self createSubViews]; 39 + // Do any additional setup after loading the view.
  40 + self.automaticallyAdjustsScrollViewInsets = NO;
  41 + self.view.backgroundColor = [UIColor whiteColor];
  42 + [self createUI];
  43 +}
  44 +
  45 +- (void)createUI{
  46 + CNLiveLoginView *loginView = [[CNLiveLoginView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop+20, self.view.frame.size.width*3/4.0, 400)];
  47 + loginView.delegate = self;
  48 + [self.view addSubview:loginView];
  49 + self.loginView = loginView;
  50 +
  51 + CNLiveThreeLoginView *threeLoginView = [[CNLiveThreeLoginView alloc] initWithFrame:CGRectMake(loginView.left, loginView.bottom+20, loginView.width, 100)];
  52 + threeLoginView.delegate = self;
  53 + [self.view addSubview:threeLoginView];
  54 + self.threeLoginView = threeLoginView;
  55 +
  56 + YYLabel *protocol = [[YYLabel alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-30-SafeAreaInsetsConstantForDeviceWithNotch.bottom, self.view.frame.size.width, 30)];
  57 + protocol.textAlignment = NSTextAlignmentCenter;
  58 + protocol.textColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
  59 + protocol.font = [UIFont systemFontOfSize:14.0];
  60 + NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"登录即代表阅读并同意《用户协议》及《隐私政策》"];
  61 + NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
  62 + style.alignment = NSTextAlignmentCenter;//对齐方式
  63 + [text addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, text.length)];
  64 + text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
  65 + text.font = [UIFont systemFontOfSize:14.0];
  66 + __weak typeof(self) weakSelf = self;
  67 + [text setTextHighlightRange:NSMakeRange(11, 4) color:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
  68 + [weakSelf.view endEditing:YES];
  69 +// [XWAgreementManager jumpToAgreementH5WithType:XWAgreementTypeUser];
  70 + }];
  71 + [text setTextHighlightRange:NSMakeRange(text.length-5, 4) color:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
  72 + [weakSelf.view endEditing:YES];
  73 +// [XWAgreementManager jumpToAgreementH5WithType:XWAgreementTypePrivacy];
32 74
  75 + }];
  76 + protocol.attributedText = text;
  77 + [self.view addSubview:protocol];
  78 + self.protocol = protocol;
  79 +
33 } 80 }
34 81
35 -- (void)dealloc { 82 +- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
  83 + [self.view endEditing:YES];
  84 +
  85 +}
  86 +
  87 +#pragma mark - CNLiveLoginViewDelegate
  88 +- (void)loginSuccess:(CNLiveLoginView *)view isNewUser:(BOOL)isNewUser result:(id _Nonnull)result{
  89 + if (isNewUser) {
  90 + // 新用户 -> 设置昵称和头像
  91 + CNLiveCompleteInfoController *vc = [[CNLiveCompleteInfoController alloc]init];
  92 + vc.hidesBottomBarWhenPushed = YES;
  93 + [self.navigationController pushViewController:vc animated:YES];
  94 +
  95 + }else{
  96 + // 老用户 -> home
  97 +// [XWAlertView alertSucceedViewWithTextMessage:@"登录成功" view:self.view block:^{
  98 +// // 通知
  99 +// [XWLoginNotification postUserLoginNotification:result];
  100 +// }];
  101 + }
36 102
  103 +}
  104 +
  105 +#pragma mark - CNLiveThreeLoginViewDelegate
  106 +- (void)clickedButton:(CNLiveThreeLoginView *)view type:(CNLiveThreeLoginType)type{
  107 + // 1.请求三方平台
37 108
  109 + // 2.绑定手机号
  110 + [self jumpToBindingTelController:type];
  111 +
38 } 112 }
39 113
40 -- (void)createSubViews { 114 +- (void)jumpToBindingTelController:(CNLiveThreeLoginType)type{
  115 + CNLiveBindingTelController *vc = [[CNLiveBindingTelController alloc]initWithType:type];
  116 + [self.navigationController pushViewController:vc animated:YES];
41 117
42 } 118 }
43 119
  120 +/*
  121 +#pragma mark - Navigation
  122 +
  123 +// In a storyboard-based application, you will often want to do a little preparation before navigation
  124 +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
  125 + // Get the new view controller using [segue destinationViewController].
  126 + // Pass the selected object to the new view controller.
  127 +}
  128 +*/
44 #pragma mark - 懒加载 129 #pragma mark - 懒加载
45 130
46 /** 131 /**
Example/CNLiveLoginModule.xcodeproj/project.pbxproj
  View file @dac5312
@@ -347,6 +347,7 @@ @@ -347,6 +347,7 @@
347 inputPaths = ( 347 inputPaths = (
348 "${PODS_ROOT}/Target Support Files/Pods-CNLiveLoginModule_Example/Pods-CNLiveLoginModule_Example-frameworks.sh", 348 "${PODS_ROOT}/Target Support Files/Pods-CNLiveLoginModule_Example/Pods-CNLiveLoginModule_Example-frameworks.sh",
349 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 349 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
  350 + "${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
350 "${BUILT_PRODUCTS_DIR}/CNLiveLoginModule/CNLiveLoginModule.framework", 351 "${BUILT_PRODUCTS_DIR}/CNLiveLoginModule/CNLiveLoginModule.framework",
351 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", 352 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
352 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 353 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
@@ -354,10 +355,12 @@ @@ -354,10 +355,12 @@
354 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 355 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
355 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 356 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
356 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 357 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
  358 + "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
357 ); 359 );
358 name = "[CP] Embed Pods Frameworks"; 360 name = "[CP] Embed Pods Frameworks";
359 outputPaths = ( 361 outputPaths = (
360 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 362 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
  363 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
361 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveLoginModule.framework", 364 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveLoginModule.framework",
362 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", 365 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
363 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 366 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
@@ -365,6 +368,7 @@ @@ -365,6 +368,7 @@
365 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 368 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
366 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
367 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
  371 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
368 ); 372 );
369 runOnlyForDeploymentPostprocessing = 0; 373 runOnlyForDeploymentPostprocessing = 0;
370 shellPath = /bin/sh; 374 shellPath = /bin/sh;