iOS Team / LiveVideoCloud · Commits

Commit cc77629c314173199d5651aa4fed68b808f5f406

Authored by 王军波
2 parents 7b1a65e3 bbcbd404

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

Inline Side-by-side
Showing 24 changed files with 61 additions and 11 deletions
LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @cc77629
@@ -2,4 +2,54 @@ @@ -2,4 +2,54 @@
2 <Bucket 2 <Bucket
3 type = "1" 3 type = "1"
4 version = "2.0"> 4 version = "2.0">
  5 + <Breakpoints>
  6 + <BreakpointProxy
  7 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  8 + <BreakpointContent
  9 + shouldBeEnabled = "Yes"
  10 + ignoreCount = "0"
  11 + continueAfterRunningActions = "No"
  12 + filePath = "LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m"
  13 + timestampString = "520237865.304262"
  14 + startingColumnNumber = "9223372036854775807"
  15 + endingColumnNumber = "9223372036854775807"
  16 + startingLineNumber = "33"
  17 + endingLineNumber = "33"
  18 + landmarkName = "-viewDidLoad"
  19 + landmarkType = "7">
  20 + </BreakpointContent>
  21 + </BreakpointProxy>
  22 + <BreakpointProxy
  23 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  24 + <BreakpointContent
  25 + shouldBeEnabled = "Yes"
  26 + ignoreCount = "0"
  27 + continueAfterRunningActions = "No"
  28 + filePath = "LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m"
  29 + timestampString = "520237929.578646"
  30 + startingColumnNumber = "9223372036854775807"
  31 + endingColumnNumber = "9223372036854775807"
  32 + startingLineNumber = "143"
  33 + endingLineNumber = "143"
  34 + landmarkName = "-request"
  35 + landmarkType = "7">
  36 + </BreakpointContent>
  37 + </BreakpointProxy>
  38 + <BreakpointProxy
  39 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  40 + <BreakpointContent
  41 + shouldBeEnabled = "Yes"
  42 + ignoreCount = "0"
  43 + continueAfterRunningActions = "No"
  44 + filePath = "LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m"
  45 + timestampString = "520237933.08285"
  46 + startingColumnNumber = "9223372036854775807"
  47 + endingColumnNumber = "9223372036854775807"
  48 + startingLineNumber = "126"
  49 + endingLineNumber = "126"
  50 + landmarkName = "-request"
  51 + landmarkType = "7">
  52 + </BreakpointContent>
  53 + </BreakpointProxy>
  54 + </Breakpoints>
5 </Bucket> 55 </Bucket>
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/Contents.json
  View file @cc77629
@@ -3,67 +3,67 @@ @@ -3,67 +3,67 @@
3 { 3 {
4 "size" : "20x20", 4 "size" : "20x20",
5 "idiom" : "iphone", 5 "idiom" : "iphone",
6 - "filename" : "ic_launcher40.png", 6 + "filename" : "web_hi_res40.png",
7 "scale" : "2x" 7 "scale" : "2x"
8 }, 8 },
9 { 9 {
10 "size" : "20x20", 10 "size" : "20x20",
11 "idiom" : "iphone", 11 "idiom" : "iphone",
12 - "filename" : "ic_launcher60.png", 12 + "filename" : "web_hi_res60.png",
13 "scale" : "3x" 13 "scale" : "3x"
14 }, 14 },
15 { 15 {
16 "size" : "29x29", 16 "size" : "29x29",
17 "idiom" : "iphone", 17 "idiom" : "iphone",
18 - "filename" : "ic_launcher29.png", 18 + "filename" : "web_hi_res29.png",
19 "scale" : "1x" 19 "scale" : "1x"
20 }, 20 },
21 { 21 {
22 "size" : "29x29", 22 "size" : "29x29",
23 "idiom" : "iphone", 23 "idiom" : "iphone",
24 - "filename" : "ic_launcher58.png", 24 + "filename" : "web_hi_res58.png",
25 "scale" : "2x" 25 "scale" : "2x"
26 }, 26 },
27 { 27 {
28 "size" : "29x29", 28 "size" : "29x29",
29 "idiom" : "iphone", 29 "idiom" : "iphone",
30 - "filename" : "ic_launcher87.png", 30 + "filename" : "web_hi_res87.png",
31 "scale" : "3x" 31 "scale" : "3x"
32 }, 32 },
33 { 33 {
34 "size" : "40x40", 34 "size" : "40x40",
35 "idiom" : "iphone", 35 "idiom" : "iphone",
36 - "filename" : "ic_launcher80.png", 36 + "filename" : "web_hi_res80.png",
37 "scale" : "2x" 37 "scale" : "2x"
38 }, 38 },
39 { 39 {
40 "size" : "40x40", 40 "size" : "40x40",
41 "idiom" : "iphone", 41 "idiom" : "iphone",
42 - "filename" : "ic_launcher120-1.png", 42 + "filename" : "web_hi_res120-1.png",
43 "scale" : "3x" 43 "scale" : "3x"
44 }, 44 },
45 { 45 {
46 "size" : "57x57", 46 "size" : "57x57",
47 "idiom" : "iphone", 47 "idiom" : "iphone",
48 - "filename" : "ic_launcher57.png", 48 + "filename" : "web_hi_res57.png",
49 "scale" : "1x" 49 "scale" : "1x"
50 }, 50 },
51 { 51 {
52 "size" : "57x57", 52 "size" : "57x57",
53 "idiom" : "iphone", 53 "idiom" : "iphone",
54 - "filename" : "ic_launcher114.png", 54 + "filename" : "web_hi_res114.png",
55 "scale" : "2x" 55 "scale" : "2x"
56 }, 56 },
57 { 57 {
58 "size" : "60x60", 58 "size" : "60x60",
59 "idiom" : "iphone", 59 "idiom" : "iphone",
60 - "filename" : "ic_launcher120.png", 60 + "filename" : "web_hi_res120png.png",
61 "scale" : "2x" 61 "scale" : "2x"
62 }, 62 },
63 { 63 {
64 "size" : "60x60", 64 "size" : "60x60",
65 "idiom" : "iphone", 65 "idiom" : "iphone",
66 - "filename" : "ic_launcher180.png", 66 + "filename" : "web_hi_res180.png",
67 "scale" : "3x" 67 "scale" : "3x"
68 } 68 }
69 ], 69 ],
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher114.png deleted 100644 → 0
View file @7b1a65e

4.69 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher120-1.png deleted 100644 → 0
View file @7b1a65e

5.17 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher120.png deleted 100644 → 0
View file @7b1a65e

5.17 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher180.png deleted 100644 → 0
View file @7b1a65e

9.3 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher29.png deleted 100644 → 0
View file @7b1a65e

1.38 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher40.png deleted 100644 → 0
View file @7b1a65e

1.79 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher57.png deleted 100644 → 0
View file @7b1a65e

2.62 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher58.png deleted 100644 → 0
View file @7b1a65e

2.75 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher60.png deleted 100644 → 0
View file @7b1a65e

2.6 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher80.png deleted 100644 → 0
View file @7b1a65e

3.42 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher87.png deleted 100644 → 0
View file @7b1a65e

3.6 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res114.png 0 → 100644
View file @cc77629

5.55 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res120-1.png 0 → 100644
View file @cc77629

5.95 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res120png.png 0 → 100644
View file @cc77629

5.95 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res180.png 0 → 100644
View file @cc77629

9.95 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res29.png 0 → 100644
View file @cc77629

1.51 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res40.png 0 → 100644
View file @cc77629

2.1 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res57.png 0 → 100644
View file @cc77629

2.73 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res58.png 0 → 100644
View file @cc77629

2.91 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res60.png 0 → 100644
View file @cc77629

2.91 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res80.png 0 → 100644
View file @cc77629

3.96 KB
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/web_hi_res87.png 0 → 100644
View file @cc77629

4.46 KB