home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-16 16:28:45 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
nixzhu
2015-04-01 19:07:53 +08:00
parent cda9aa4a92 d6df3a0b39
commit 3d3eba79cc
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep.xcodeproj/project.pbxproj
+4
View File
@@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
0A02E46F1AC9208A00235DBF /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A02E46E1AC9208A00235DBF /* libxml2.dylib */; };
0A271FD71ACA055400822DFC /* YepAudioService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A271FD61ACA055400822DFC /* YepAudioService.swift */; };
0A3E60591ACC0318003DC853 /* YepWaverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A3E60581ACC0318003DC853 /* YepWaverView.swift */; };
0A5D83941AC5D3C8000045BF /* YepTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5D83931AC5D3C8000045BF /* YepTabBarController.swift */; };
0A5D83991AC5D91E000045BF /* ContactsSearchTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5D83981AC5D91E000045BF /* ContactsSearchTableViewController.swift */; };
0A6F46FD1ACBBF2D000CCD6F /* Waver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6F46FC1ACBBF2D000CCD6F /* Waver.swift */; };
@@ -104,6 +105,7 @@
0A02E46C1AC9205000235DBF /* KissXML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KissXML.framework; path = "Pods/../build/Debug-iphoneos/Pods/KissXML.framework"; sourceTree = "<group>"; };
0A02E46E1AC9208A00235DBF /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
0A271FD61ACA055400822DFC /* YepAudioService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepAudioService.swift; path = Services/YepAudioService.swift; sourceTree = "<group>"; };
0A3E60581ACC0318003DC853 /* YepWaverView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepWaverView.swift; path = Views/Component/YepWaverView.swift; sourceTree = "<group>"; };
0A5D83931AC5D3C8000045BF /* YepTabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepTabBarController.swift; path = ViewControllers/TabBar/YepTabBarController.swift; sourceTree = "<group>"; };
0A5D83981AC5D91E000045BF /* ContactsSearchTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsSearchTableViewController.swift; path = ViewControllers/Contacts/Search/ContactsSearchTableViewController.swift; sourceTree = "<group>"; };
0A6F46FC1ACBBF2D000CCD6F /* Waver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Waver.swift; sourceTree = "<group>"; };
@@ -395,6 +397,7 @@
5099B9C51AB95111002F940B /* Rank */,
5099B9CA1AB9A7CF002F940B /* CameraPreview */,
503315A11AC126140008A209 /* MessageToolbar */,
0A3E60581ACC0318003DC853 /* YepWaverView.swift */,
);
name = Views;
sourceTree = "<group>";
@@ -877,6 +880,7 @@
5023DE591AB6DBC100B3EE96 /* UIImage+Yep.swift in Sources */,
502AE5331AB86020005BD199 /* RegisterVerifyMobileViewController.swift in Sources */,
502AE5401AB88862005BD199 /* SkillRankCell.swift in Sources */,
0A3E60591ACC0318003DC853 /* YepWaverView.swift in Sources */,
5023DE2D1AB685ED00B3EE96 /* DiscoverViewController.swift in Sources */,
502AE53A1AB871C1005BD199 /* YepAlert.swift in Sources */,
502AE52E1AB83879005BD199 /* UnderLineTextField.swift in Sources */,
Yep/Services/FayeService.swift
+6 -2
View File
@@ -74,8 +74,12 @@ class FayeService: NSObject, MZFayeClientDelegate {
println("fayeClient didConnectToURL \(url)")
}
func fayeClient(client: MZFayeClient!, didDisconnectWithError error: NSError!) {
println("fayeClient didDisconnectWithError \(error.description)")
func fayeClient(client: MZFayeClient!, didDisconnectWithError error: NSError?) {
if let error = error {
println("fayeClient didDisconnectWithError \(error.description)")
}
}
func fayeClient(client: MZFayeClient!, didFailDeserializeMessage message: [NSObject : AnyObject]!, withError error: NSError!) {
Yep/Views/Component/YepWaverView.swift
+37
View File
@@ -0,0 +1,37 @@
//
// YepWaverView.swift
// Yep
//
// Created by kevinzhow on 15/4/1.
// Copyright (c) 2015年 Catch Inc. All rights reserved.
//
import UIKit
class YepWaverView: UIView {
var waver: Waver!
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
override func drawRect(rect: CGRect) {
// Drawing code
}
*/
override init(frame: CGRect) {
super.init(frame: frame)
}
required init(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
private func setup() {
waver = Waver(frame: CGRectMake(0, CGRectGetHeight(self.bounds)/2.0 - 50.0, CGRectGetWidth(self.bounds), 100.0))
self.backgroundColor = UIColor(white: 1.0, alpha: 0.4)
}
}