iOS Team / ScioLive · Commits

Commit 694a99bd031753aca30a5014cfc75a4a7806d4a7

Authored by zhangxiaowen
1 parent 847ec4b8

no message

Inline Side-by-side
Showing 4 changed files with 4 additions and 4 deletions
CNLiveScioLive/Assets.xcassets/live/cnlive_share.imageset/Contents.json renamed to CNLiveScioLive/Assets.xcassets/live/cnlive_live_share.imageset/Contents.json
  View file @694a99b
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 }, 6 },
7 { 7 {
8 "idiom" : "universal", 8 "idiom" : "universal",
9 - "filename" : "cnlive_share@2x.png", 9 + "filename" : "cnlive_live_share@2x.png",
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
14 - "filename" : "cnlive_share@3x.png", 14 + "filename" : "cnlive_live_share@3x.png",
15 "scale" : "3x" 15 "scale" : "3x"
16 } 16 }
17 ], 17 ],
CNLiveScioLive/Assets.xcassets/live/cnlive_share.imageset/cnlive_share@2x.png renamed to CNLiveScioLive/Assets.xcassets/live/cnlive_live_share.imageset/cnlive_live_share@2x.png
View file @694a99b

2.99 KB
CNLiveScioLive/Assets.xcassets/live/cnlive_share.imageset/cnlive_share@3x.png renamed to CNLiveScioLive/Assets.xcassets/live/cnlive_live_share.imageset/cnlive_live_share@3x.png
View file @694a99b

5.09 KB
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @694a99b
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 184
185 UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom]; 185 UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
186 [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside]; 186 [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside];
187 - [shareButton setImage:[UIImage imageNamed:@"cnlive_share"] forState:UIControlStateNormal]; 187 + [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
188 [shareButton setFrame:CGRectMake(MainScreenWidth-44, StatusBarHeight, 44, 44)]; 188 [shareButton setFrame:CGRectMake(MainScreenWidth-44, StatusBarHeight, 44, 44)];
189 [self.view addSubview:shareButton]; 189 [self.view addSubview:shareButton];
190 190
@@ -215,7 +215,7 @@ @@ -215,7 +215,7 @@
215 //////////////// 分享 //////////////// 215 //////////////// 分享 ////////////////
216 UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom]; 216 UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
217 shareButton.frame = CGRectMake(MainScreenWidth-35, 20, 25, 41); 217 shareButton.frame = CGRectMake(MainScreenWidth-35, 20, 25, 41);
218 - [shareButton setImage:[UIImage imageNamed:@"cnlive_share"] forState:UIControlStateNormal]; 218 + [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
219 [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside]; 219 [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside];
220 [bgView addSubview:shareButton]; 220 [bgView addSubview:shareButton];
221 //////////////// 221 ////////////////