Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chriskuei
Chriskuei committed May 27, 2016
1 parent c2894f5 commit 6ef275a
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 245 deletions.
30 changes: 0 additions & 30 deletions Bon/BIT.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,6 @@ class BIT {
loginErrorMessage["mac_error"] = "Your MAC address is not valid"
loginErrorMessage["sync_error"] = "Your information has been modified, waiting for synchronization, please try again after 2 minutes"

// loginStatus["user_tab_error"] = "认证程序未启动"
// loginStatus["username_error"] = "用户名错误"
// loginStatus["non_auth_error"] = "您无须认证，可直接上网"
// loginStatus["password_error"] = "密码错误"
// loginStatus["status_error"] = "用户已欠费，请尽快充值。"
// loginStatus["available_error"] = "用户已禁用"
// loginStatus["ip_exist_error"] = "您的IP尚未下线，请等待2分钟再试。"
// loginStatus["usernum_error"] = "用户数已达上限"
// loginStatus["online_num_error"] = "该帐号的登录人数已超过限额\n如果怀疑帐号被盗用，请联系管理员。"
// loginStatus["mode_error"] = "系统已禁止WEB方式登录，请使用客户端"
// loginStatus["time_policy_error"] = "当前时段不允许连接"
// loginStatus["flux_error"] = "您的流量已超支"
// loginStatus["minutes_error"] = "您的时长已超支"
// loginStatus["ip_error"] = "您的IP地址不合法"
// loginStatus["mac_error"] = "您的MAC地址不合法"
// loginStatus["sync_error"] = "您的资料已修改，正在等待同步，请2分钟后再试。"

return loginErrorMessage
}()

Expand All @@ -80,13 +63,6 @@ class BIT {
logoutMessage["logout_ok"] = "Logout success, please wait 1 minutes and login in。"
logoutMessage["logout_error"] = "You are offline"
logoutMessage["uid_error"] = "You are offline"


// logoutStatus["user_tab_error"] = "认证程序未启动"
// logoutStatus["username_error"] = "用户名错误"
// logoutStatus["password_error"] = "密码错误"
// logoutStatus["logout_ok"] = "注销成功，请等1分钟后登录。"
// logoutStatus["logout_error"] = "您不在线上"

return logoutMessage
}()
Expand All @@ -100,12 +76,6 @@ class BIT {
keepLiveMessage["flux_error"] = "Your flow is overdrawn"
keepLiveMessage["minutes_error"] = "Your time is overdrawn"

// keepLiveStatus["status_error"] = "您的帐户余额不足"
// keepLiveStatus["available_error"] = "您的帐户被禁用"
// keepLiveStatus["drop_error"] = "您被强制下线"
// keepLiveStatus["flux_error"] = "您的流量已超支"
// keepLiveStatus["minutes_error"] = "您的时长已超支"

return keepLiveMessage
}()
}
10 changes: 5 additions & 5 deletions Bon/BonCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class BonCell: NSTableCellView {
@IBOutlet weak var typeImageView: NSImageView!
@IBOutlet weak var nameLabel: NSTextField!
@IBOutlet weak var infoLabel: NSTextField!
@IBOutlet weak var circleView: NSView!
//@IBOutlet weak var circleView: NSView!

private let squareWithCircleView: SquareWithCircleView = SquareWithCircleView(frame: CGRectZero)

Expand Down Expand Up @@ -82,8 +82,8 @@ class BonCell: NSTableCellView {
infoLabel.stringValue = item.infoText
//circleView.layer?.backgroundColor = NSColor.bonTintColor().CGColor

circleView.addSubview(squareWithCircleView)
squareWithCircleView.frame = circleView.bounds
//circleView.addSubview(squareWithCircleView)
//squareWithCircleView.frame = circleView.bounds
//squareWithCircleView.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]

//typeImageView.image = NSImage(named: item.imageType)
Expand Down Expand Up @@ -119,8 +119,8 @@ class SquareWithCircleView: NSView{
{
let circleFillColor = NSColor.bonTintColor()
let circleRect = NSMakeRect(dirtyRect.size.width/4, dirtyRect.size.height/4, dirtyRect.size.width/2, dirtyRect.size.height/2)
let cPath: NSBezierPath = NSBezierPath(ovalInRect: circleRect)
let path: NSBezierPath = NSBezierPath(ovalInRect: circleRect)
circleFillColor.set()
cPath.fill()
path.fill()
}
}
159 changes: 10 additions & 149 deletions Bon/BonNetwork.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,14 @@ import Alamofire

class BonNetwork: NSObject {

var alamoFireManager = Alamofire.Manager.sharedInstance

// let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
// configuration.timeoutIntervalForRequest = 4 // seconds
// configuration.timeoutIntervalForResource = 4
// self.alamoFireManager = Alamofire.Manager(configuration: configuration)
// let center = NSNotificationCenter.defaultCenter()
// var alamoFireManager : Alamofire.Manager?
//
// var configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
// //configuration.timeoutIntervalForRequest = 4 // seconds
// configuration.timeoutIntervalForResource = 4
// self.alamoFireManager = Alamofire.Manager(configuration: configuration)

// var alamofireManager : Manager?
// // 设置请求的超时时间
// let config = NSURLSessionConfiguration.defaultSessionConfiguration()
// config.timeoutIntervalForRequest = 5 // 秒
// self.alamofireManager = Manager(configuration: config)

/**
* login function
* url : url
* params : JSON
* success : Request success callback function
* post function
* parameters: JSON
* success: Request success callback function
*/

static func post(parameters: [String : AnyObject]?, success: (value: String) -> Void) {

//UIApplication.sharedApplication().networkActivityIndicatorVisible = true
Alamofire.request(.POST, BIT.URL.AuthActionURL, parameters: parameters)
.responseString{ response in
switch response.result {
Expand All @@ -55,10 +33,15 @@ class BonNetwork: NSObject {

}

/**
* post function
* parameters: JSON
* success: Request success callback function
* fail: Request fail callback function
*/

static func post(parameters: [String : AnyObject]?, success: (value: String) -> Void, fail: (error : Any) -> Void) {

//UIApplication.sharedApplication().networkActivityIndicatorVisible = true
Alamofire.request(.POST, BIT.URL.AuthActionURL, parameters: parameters)
.responseString{ response in
switch response.result {
Expand All @@ -74,61 +57,7 @@ class BonNetwork: NSObject {
}


/**
* login function
* url : url
* params : JSON
* success : Request success callback function
*/

static func login(parameters: [String : AnyObject]?, success: (value: String) -> Void) {

//UIApplication.sharedApplication().networkActivityIndicatorVisible = true
Alamofire.request(.POST, BIT.URL.DoLoginURL, parameters: parameters)
.responseString{ response in
switch response.result {
case .Success(let value):
success(value: value)

case .Failure(let error):
print("Request failed with error: \(error)")
}
}


}


/**
* keepLive function
* parameters : JSON
* success : Request success callback function
*/

static func keepLive(parameters: [String : AnyObject]?, success: (value: String) -> Void) {

Alamofire.request(.POST, BIT.URL.KeepLiveURL, parameters: parameters)
.responseString { response in
switch response.result {
case .Success(let value):
success(value: value)

case .Failure(let error):
print("Request failed with error: \(error)")
}

}

}

/**
* logout function
* url : url
* params : JSON
* success : Request success callback function
*/

func logout() {
static func logout() {

let parameters = [
"action": "auto_logout"
Expand All @@ -137,74 +66,6 @@ class BonNetwork: NSObject {
}
}

// FIXME: It doesn't work well

/**
* forceLogout function
* url : url
* params : JSON
* success : Request success callback function
*/

static func forceLogout(parameters :[String : AnyObject]?, success :(value : String) -> Void) {

Alamofire.request(.POST, BIT.URL.ForceLogoutURL, parameters: parameters)
.responseString { response in
switch response.result {
case .Success(let value):
success(value: value)

case .Failure(let error):
print("Request failed with error: \(error)")
}
}
}


// MARK: Get user balance, show it on another view

/**
* getBalance function
* url : url
* params : JSON
* success : Request success callback function
*/

static func getBalance(parameters :[String : AnyObject]?, success :(value : AnyObject?) -> Void) {

Alamofire.request(.GET, BIT.URL.UserOnlineURL, parameters: parameters)
.responseJSON { response in
switch response.result {
case .Success(let value):
success(value: value)

case .Failure(let error):
print("Request failed with error: \(error)")
}
}
}

/**
* getLoginState function
* url : url
* params : JSON
* success : Request success callback function
*/


static func getOnlineInfo(success: (value : String) -> Void) {

let parameters = [
"action": "get_online_info"
]

post(parameters) { (value) in
success(value: value)
}

}


static func updateLoginState() {

let parameters = [
Expand Down
30 changes: 0 additions & 30 deletions Bon/BonUserDefaults.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,6 @@ let balanceKey = "balance"
let usedDataKey = "usedData"
let secondsKey = "seconds"

//Get balance success with string: {
// "buy_mbytes" = "0.00";
// "buy_minutes" = "<null>";
// charge = "10.00";
// client = WEB;
// fid = 1304;
// "flux_long" = "9.50G";
// "flux_long1" = B;
// "flux_long6" = B;
// "free_in_bytes" = 1B;
// "free_out_bytes" = 0B;
// ipv = 4;
// limit = 0;
// "month_fee" = "10.00";
// "remain_fee" = "1.53";
// "remain_flux" = "2,030.82M";
// "remain_timelong" = "<null>";
// speed = 0;
// "time_long" = 0;
// "time_long1" = 0;
// "time_long6" = 0;
// uid = 44064;
// "user_balance" = "11.53";
// "user_in_bytes" = "22.98KB";
// "user_ip" = "10.194.182.53";
// "user_login_name" = 1120141755;
// "user_login_time" = "2016-04-19 18:27:22";
// "user_out_bytes" = "25.10KB";
//}

class BonUserDefaults {

static let defaults = NSUserDefaults.standardUserDefaults()
Expand Down
15 changes: 2 additions & 13 deletions Bon/BonViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,22 +216,11 @@ class BonViewController: NSViewController {
infoTableView.reloadData()
}

func updateTime() {
seconds = seconds + 1
// let date = NSDate()
// let formatter = NSDateFormatter()
// formatter.timeStyle = .MediumStyle
// timeLabel.text = formatter.stringFromDate(date)
}

func quit() {
NSApplication.sharedApplication().terminate(self)
}


}


// MARK: - Table view

extension BonViewController: NSTableViewDataSource {

func numberOfRowsInTableView(aTableView: NSTableView) -> Int {
Expand Down
Loading

0 comments on commit 6ef275a

Please sign in to comment.