iOS Team / CNLiveMateCode · Commits

Commit f89b8f7bef9a6fc3d74c53405e94470401d17bfd

Authored by liushiyu
2 parents 33b8fbc7 88571fd2

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

Inline Side-by-side
Showing 16 changed files with 25 additions and 4 deletions
metaCode/Classes/Main/HomePage/View/CNMainView.swift
  View file @f89b8f7
... ... @@ -51,9 +51,10 @@ class CNFrontMainView : UIView{
51 51 contentView.clipsToBounds = true
52 52 contentView.layer.cornerRadius = 20
53 53  
54   -// let imageView = UIImageView.init(frame: CGRect(x: 10, y: 10, width: contentView.width - 20, height: contentView.height - 20))
55   -// imageView.image = UIImage.init(named: "homePage_mainView_front");
56   -// contentView.addSubview(imageView)
  54 + let W = contentView.width - 40
  55 + let imageView = UIImageView.init(frame: CGRect(x: 20, y: 25, width: W, height: W*0.63))
  56 + imageView.image = UIImage.init(named: "homePage_mainView_front");
  57 + contentView.addSubview(imageView)
57 58  
58 59 return contentView
59 60  
... ...
metaCode/Classes/Main/HomePage/View/CNPayMoneyCodeView.swift
  View file @f89b8f7
... ... @@ -7,6 +7,7 @@
7 7  
8 8 import Foundation
9 9 import YYCategories
  10 +import WebKit
10 11  
11 12 ///付钱码view
12 13 class CNPayMoneyCodeView:UIView{
... ... @@ -26,6 +27,15 @@ class CNPayMoneyCodeView:UIView{
26 27 self.clipsToBounds = true;
27 28 self.layer.cornerRadius = 20;
28 29  
  30 + let webView:WKWebView = WKWebView.init(frame: CGRectMake(10, 20, self.width - 20, self.height - 20))
  31 + let url: URL! = URL.init(string: "https://www.baidu.com")
  32 + webView.load(URLRequest.init(url:url))
  33 + webView.scrollView.showsVerticalScrollIndicator = false
  34 + webView.scrollView.showsHorizontalScrollIndicator = false
  35 +
  36 + self.addSubview(webView)
  37 +
  38 +
29 39 // let imageview : UIImageView = UIImageView.init(frame: CGRect(x: 20, y: 10, width: self.width - 40, height: self.height - 20))
30 40 // imageview.image = UIImage(named: "homePage_payMoneyImage")
31 41 //
... ...
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json
  View file @f89b8f7
1 1 {
2 2 "images" : [
3 3 {
  4 + "filename" : "icon_20pt@2x.png",
4 5 "idiom" : "iphone",
5 6 "scale" : "2x",
6 7 "size" : "20x20"
7 8 },
8 9 {
  10 + "filename" : "icon_20pt@3x.png",
9 11 "idiom" : "iphone",
10 12 "scale" : "3x",
11 13 "size" : "20x20"
12 14 },
13 15 {
  16 + "filename" : "icon_29pt@2x.png",
14 17 "idiom" : "iphone",
15 18 "scale" : "2x",
16 19 "size" : "29x29"
17 20 },
18 21 {
  22 + "filename" : "icon_29pt@3x.png",
19 23 "idiom" : "iphone",
20 24 "scale" : "3x",
21 25 "size" : "29x29"
22 26 },
23 27 {
  28 + "filename" : "icon_40pt@2x.png",
24 29 "idiom" : "iphone",
25 30 "scale" : "2x",
26 31 "size" : "40x40"
27 32 },
28 33 {
  34 + "filename" : "icon_40pt@3x.png",
29 35 "idiom" : "iphone",
30 36 "scale" : "3x",
31 37 "size" : "40x40"
32 38 },
33 39 {
  40 + "filename" : "icon_60pt@2x.png",
34 41 "idiom" : "iphone",
35 42 "scale" : "2x",
36 43 "size" : "60x60"
37 44 },
38 45 {
  46 + "filename" : "icon_60pt@3x.png",
39 47 "idiom" : "iphone",
40 48 "scale" : "3x",
41 49 "size" : "60x60"
... ... @@ -81,6 +89,7 @@
81 89 "size" : "83.5x83.5"
82 90 },
83 91 {
  92 + "filename" : "icon_1024.png",
84 93 "idiom" : "ios-marketing",
85 94 "scale" : "1x",
86 95 "size" : "1024x1024"
... ...
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_1024.png 0 → 100644
View file @f89b8f7

239 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png 0 → 100644
View file @f89b8f7

3.5 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png 0 → 100644
View file @f89b8f7

5.71 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png 0 → 100644
View file @f89b8f7

5.52 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png 0 → 100644
View file @f89b8f7

9.02 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png 0 → 100644
View file @f89b8f7

8.25 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png 0 → 100644
View file @f89b8f7

14.3 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png 0 → 100644
View file @f89b8f7

14.3 KB
metaCode/Supporting Files/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png 0 → 100644
View file @f89b8f7

23.9 KB
metaCode/Supporting Files/Assets.xcassets/Home/homePage_mainView_front.imageset/4621683513846_.pic.jpg deleted 100644 → 0
View file @33b8fbc

56.9 KB
metaCode/Supporting Files/Assets.xcassets/Home/homePage_mainView_front.imageset/Contents.json
  View file @f89b8f7
... ... @@ -5,11 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "4621683513846_.pic.jpg",
  8 + "filename" : "证件@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
  13 + "filename" : "证件@3x.png",
13 14 "idiom" : "universal",
14 15 "scale" : "3x"
15 16 }
... ...
metaCode/Supporting Files/Assets.xcassets/Home/homePage_mainView_front.imageset/证件@2x.png 0 → 100644
View file @f89b8f7

35.9 KB
metaCode/Supporting Files/Assets.xcassets/Home/homePage_mainView_front.imageset/证件@3x.png 0 → 100644
View file @f89b8f7

67.6 KB