Skip to content

Commit

Permalink
new services
Browse files Browse the repository at this point in the history
  • Loading branch information
@siamakrostami
siamakrostami committed Mar 15, 2020
1 parent 29ae458 commit 0d17cad
Show file tree
Hide file tree
Showing 21 changed files with 2,307 additions and 859 deletions.
632 changes: 316 additions & 316 deletions Example/Pods/Pods.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Example/vaslAppSdk.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@
baseConfigurationReference = 8527524601BCF2B5DF7B211C /* Pods-vaslAppSdk_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 61;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = 4ZW7S4J23N;
FRAMEWORK_SEARCH_PATHS = (
"\"${PODS_CONFIGURATION_BUILD_DIR}/Alamofire\"",
Expand All @@ -507,7 +507,7 @@
INFOPLIST_FILE = vaslAppSdk/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.6.5;
MARKETING_VERSION = 0.6.6;
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -520,7 +520,7 @@
baseConfigurationReference = DCC4CE44F6E818A602D845CC /* Pods-vaslAppSdk_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 61;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = 4ZW7S4J23N;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -531,7 +531,7 @@
INFOPLIST_FILE = vaslAppSdk/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.6.5;
MARKETING_VERSION = 0.6.6;
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
16 changes: 8 additions & 8 deletions Example/vaslAppSdk/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ class ViewController: UIViewController {
username: username,
password: password, nounce: "FPLFJ0pCx6")

// let newcontent = ["salam"]
let newcontent = ["salam"]

//
// vmbas.KalingaServices()?.editContent(contentId: "5e5f9b8e5be32a00092b8bed", headline: "test", banner: "", summery: "test", content: newcontent, status: "PUBLISHED", tags: [], catIds: [], lat: "35.69859313964844", lng: "51.33749008178711", propertyValue: [], language: "", type: "", sessionId: session, completion: { (data, error) in
// if error == nil {
// debugPrint(data!)
// }else{
// debugPrint(error!)
// }
// })
vmbas.KalingaServices()?.editContent(contentId: "5e5f9b8e5be32a00092b8bed", headline: "test", banner: "", summery: "test", content: newcontent, status: "PUBLISHED", tags: [], catIds: [], lat: "35.69859313964844", lng: "51.33749008178711", propertyValue: [], language: "", type: "", sessionId: session, completion: { (data, error) in
if error == nil {
debugPrint(data!)
}else{
debugPrint(error!)
}
})

// vmbas.DynamicTableEndPointService()?.endpointFind(tableName: "allleagues", find: "{}", projection: "{}", sort: "{}", skip: "", limit: "", sessionId: session, completion: { (data, error) in
// if error == nil{
Expand Down
2 changes: 1 addition & 1 deletion vaslAppSdk.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'vaslAppSdk'
s.version = '0.6.5'
s.version = '0.6.6'
s.swift_version = '5'
s.summary = 'vaslAppSdk is a Framework for connectin to Mbas-Vasl service '

Expand Down
30 changes: 15 additions & 15 deletions vaslAppSdk/Classes/Module/AnalyticServiceV1Impl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import Foundation

protocol AnalyticServiceV1 {

func addEvent(data: Array<String>, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void)

func setDeviceInfo(deviceId: String, info: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void)

func addEvent(data: Array<String>, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void)

func setBrhaviorFlow(info: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void)

func setDeviceinfoByDate(deviceInfo: Array<String>, deviceId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void)
Expand All @@ -23,18 +23,19 @@ protocol AnalyticServiceV1 {
public class AnalyticServiceV1Impl : AnalyticServiceV1 {


public func addEvent(data: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) {
addEvent(data: data, sessionId: sessionId, completion: completion,force: true)
public func setDeviceInfo(deviceId: String, info: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) {
setDeviceInfo(deviceId: deviceId, info: info, sessionId: sessionId, completion: completion,force: true)
}

private func addEvent(data: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void,force : Bool) {
private func setDeviceInfo(deviceId: String, info: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(data , forKey: "data")
params.updateValue(deviceId , forKey: "deviceId")
params.updateValue(info , forKey: "info")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/analytics/event/add", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/analytics/deviceinfo/set", params, completion: { (result, error) in
do{
if let result = result {

Expand All @@ -44,7 +45,7 @@ public class AnalyticServiceV1Impl : AnalyticServiceV1 {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.addEvent(data: data, sessionId: sessionId, completion: completion,force: false)
self.setDeviceInfo(deviceId: deviceId, info: info, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand All @@ -57,19 +58,18 @@ public class AnalyticServiceV1Impl : AnalyticServiceV1 {
}


public func setDeviceInfo(deviceId: String, info: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) {
setDeviceInfo(deviceId: deviceId, info: info, sessionId: sessionId, completion: completion,force: true)
public func addEvent(data: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) {
addEvent(data: data, sessionId: sessionId, completion: completion,force: true)
}

private func setDeviceInfo(deviceId: String, info: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void,force : Bool) {
private func addEvent(data: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(deviceId , forKey: "deviceId")
params.updateValue(info , forKey: "info")
params.updateValue(data , forKey: "data")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/analytics/deviceinfo/set", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/analytics/event/add", params, completion: { (result, error) in
do{
if let result = result {

Expand All @@ -79,7 +79,7 @@ public class AnalyticServiceV1Impl : AnalyticServiceV1 {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.setDeviceInfo(deviceId: deviceId, info: info, sessionId: sessionId, completion: completion,force: false)
self.addEvent(data: data, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand Down
52 changes: 26 additions & 26 deletions vaslAppSdk/Classes/Module/ChargeServiceV1Impl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,44 @@ import Foundation

protocol ChargeServiceV1 {

func callback(appid: String, subscriberId: String, transactionId: String, amount: String, bankCode: String, orderId: String, status: String, refIdHolder: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack?,String?) -> Void)

func chargeBuy(amount: String, Operator: String, bankId: String, phoneNumber: String, topup: String, merchant: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy?,String?) -> Void)

func callback(appid: String, subscriberId: String, transactionId: String, amount: String, bankCode: String, orderId: String, status: String, refIdHolder: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack?,String?) -> Void)


}


public class ChargeServiceV1Impl : ChargeServiceV1 {


public func callback(appid: String, subscriberId: String, transactionId: String, amount: String, bankCode: String, orderId: String, status: String, refIdHolder: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack?,String?) -> Void) {
callback(appid: appid, subscriberId: subscriberId, transactionId: transactionId, amount: amount, bankCode: bankCode, orderId: orderId, status: status, refIdHolder: refIdHolder, sessionId: sessionId, completion: completion,force: true)
public func chargeBuy(amount: String, Operator: String, bankId: String, phoneNumber: String, topup: String, merchant: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy?,String?) -> Void) {
chargeBuy(amount: amount, Operator: Operator, bankId: bankId, phoneNumber: phoneNumber, topup: topup, merchant: merchant, sessionId: sessionId, completion: completion,force: true)
}

private func callback(appid: String, subscriberId: String, transactionId: String, amount: String, bankCode: String, orderId: String, status: String, refIdHolder: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack?,String?) -> Void,force : Bool) {
private func chargeBuy(amount: String, Operator: String, bankId: String, phoneNumber: String, topup: String, merchant: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(appid , forKey: "appid")
params.updateValue(subscriberId , forKey: "subscriberId")
params.updateValue(transactionId , forKey: "transactionId")
params.updateValue(amount , forKey: "amount")
params.updateValue(bankCode , forKey: "bankCode")
params.updateValue(orderId , forKey: "orderId")
params.updateValue(status , forKey: "status")
params.updateValue(refIdHolder , forKey: "refIdHolder")
params.updateValue(Operator , forKey: "operator")
params.updateValue(bankId , forKey: "bankId")
params.updateValue(phoneNumber , forKey: "phoneNumber")
params.updateValue(topup , forKey: "topup")
params.updateValue(merchant , forKey: "merchant")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/optcharge/callback/gateway", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/optcharge/buy", params, completion: { (result, error) in
do{
if let result = result {

let serviceResponse = try Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack(serializedData: result) as Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack
let serviceResponse = try Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy(serializedData: result) as Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.callback(appid: appid, subscriberId: subscriberId, transactionId: transactionId, amount: amount, bankCode: bankCode, orderId: orderId, status: status, refIdHolder: refIdHolder, sessionId: sessionId, completion: completion,force: false)
self.chargeBuy(amount: amount, Operator: Operator, bankId: bankId, phoneNumber: phoneNumber, topup: topup, merchant: merchant, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand All @@ -54,33 +52,35 @@ public class ChargeServiceV1Impl : ChargeServiceV1 {
}


public func chargeBuy(amount: String, Operator: String, bankId: String, phoneNumber: String, topup: String, merchant: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy?,String?) -> Void) {
chargeBuy(amount: amount, Operator: Operator, bankId: bankId, phoneNumber: phoneNumber, topup: topup, merchant: merchant, sessionId: sessionId, completion: completion,force: true)
public func callback(appid: String, subscriberId: String, transactionId: String, amount: String, bankCode: String, orderId: String, status: String, refIdHolder: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack?,String?) -> Void) {
callback(appid: appid, subscriberId: subscriberId, transactionId: transactionId, amount: amount, bankCode: bankCode, orderId: orderId, status: status, refIdHolder: refIdHolder, sessionId: sessionId, completion: completion,force: true)
}

private func chargeBuy(amount: String, Operator: String, bankId: String, phoneNumber: String, topup: String, merchant: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy?,String?) -> Void,force : Bool) {
private func callback(appid: String, subscriberId: String, transactionId: String, amount: String, bankCode: String, orderId: String, status: String, refIdHolder: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(appid , forKey: "appid")
params.updateValue(subscriberId , forKey: "subscriberId")
params.updateValue(transactionId , forKey: "transactionId")
params.updateValue(amount , forKey: "amount")
params.updateValue(Operator , forKey: "operator")
params.updateValue(bankId , forKey: "bankId")
params.updateValue(phoneNumber , forKey: "phoneNumber")
params.updateValue(topup , forKey: "topup")
params.updateValue(merchant , forKey: "merchant")
params.updateValue(bankCode , forKey: "bankCode")
params.updateValue(orderId , forKey: "orderId")
params.updateValue(status , forKey: "status")
params.updateValue(refIdHolder , forKey: "refIdHolder")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/optcharge/buy", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/optcharge/callback/gateway", params, completion: { (result, error) in
do{
if let result = result {

let serviceResponse = try Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy(serializedData: result) as Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeBuy
let serviceResponse = try Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack(serializedData: result) as Com_Vasl_Vaslapp_Modules_Billing_Charge_Global_Proto_Holder_ChargeCallBack

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.chargeBuy(amount: amount, Operator: Operator, bankId: bankId, phoneNumber: phoneNumber, topup: topup, merchant: merchant, sessionId: sessionId, completion: completion,force: false)
self.callback(appid: appid, subscriberId: subscriberId, transactionId: transactionId, amount: amount, bankCode: bankCode, orderId: orderId, status: status, refIdHolder: refIdHolder, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand Down

0 comments on commit 0d17cad

Please sign in to comment.