Skip to content

Commit

Permalink
login
Browse files Browse the repository at this point in the history
  • Loading branch information
@siamakrostami
siamakrostami committed Apr 22, 2020
1 parent e7b11b7 commit 1a37eb0
Show file tree
Hide file tree
Showing 18 changed files with 957 additions and 957 deletions.
648 changes: 324 additions & 324 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 = 66;
CURRENT_PROJECT_VERSION = 67;
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.7.0;
MARKETING_VERSION = 0.7.1;
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 = 66;
CURRENT_PROJECT_VERSION = 67;
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.7.0;
MARKETING_VERSION = 0.7.1;
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
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.7.0'
s.version = '0.7.1'
s.swift_version = '5'
s.summary = 'vaslAppSdk is a Framework for connectin to Mbas-Vasl service '

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

protocol AnalyticServiceV1 {

func setDeviceInfo(deviceId: String, info: 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 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 setDeviceInfo(deviceId: String, 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,19 +23,18 @@ protocol AnalyticServiceV1 {
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 setBrhaviorFlow(info: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) {
setBrhaviorFlow(info: info, 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 setBrhaviorFlow(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(deviceId , forKey: "deviceId")
params.updateValue(info , forKey: "info")
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/behaviorflow/set", params, completion: { (result, error) in
do{
if let result = result {

Expand All @@ -45,7 +44,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.setBrhaviorFlow(info: info, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand Down Expand Up @@ -92,18 +91,19 @@ public class AnalyticServiceV1Impl : AnalyticServiceV1 {
}


public func setBrhaviorFlow(info: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) {
setBrhaviorFlow(info: info, 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 setBrhaviorFlow(info: 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(deviceId , forKey: "deviceId")
params.updateValue(info , forKey: "info")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/analytics/behaviorflow/set", 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 @@ -113,7 +113,7 @@ public class AnalyticServiceV1Impl : AnalyticServiceV1 {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.setBrhaviorFlow(info: info, sessionId: sessionId, completion: completion,force: false)
self.setDeviceInfo(deviceId: deviceId, info: info, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand Down
2 changes: 1 addition & 1 deletion vaslAppSdk/Classes/Module/AppServicesImpl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class AppServicesImpl : AppServices {
}

private func nearLocation(completion: @escaping (Com_Vasl_Vaslapp_Modules_App_Global_Proto_Holder_TimeGet?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
let params = Dictionary<String,Any>()


let hasNounce = false
Expand Down
36 changes: 18 additions & 18 deletions vaslAppSdk/Classes/Module/AvServiceImpl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import Foundation

protocol AvService {

func getSport(id: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi?,String?) -> Void)

func listSport(sort: String, order: String, page: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi?,String?) -> Void)

func getSport(id: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi?,String?) -> Void)

func listFederation(sort: String, order: String, page: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListFederationApi?,String?) -> Void)

func listSportEquipment(sort: String, order: String, page: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportEquipmentApi?,String?) -> Void)
Expand Down Expand Up @@ -53,27 +53,29 @@ protocol AvService {
public class AvServiceImpl : AvService {


public func getSport(id: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi?,String?) -> Void) {
getSport(id: id, completion: completion,force: true)
public func listSport(sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi?,String?) -> Void) {
listSport(sort: sort, order: order, page: page, completion: completion,force: true)
}

private func getSport(id: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi?,String?) -> Void,force : Bool) {
private func listSport(sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(id , forKey: "id")
params.updateValue(sort , forKey: "sort")
params.updateValue(order , forKey: "order")
params.updateValue(page , forKey: "page")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/av/get/sport", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/av/list/sport", params, completion: { (result, error) in
do{
if let result = result {

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi
let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.getSport(id: id, completion: completion,force: false)
self.listSport(sort: sort, order: order, page: page, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand All @@ -86,29 +88,27 @@ public class AvServiceImpl : AvService {
}


public func listSport(sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi?,String?) -> Void) {
listSport(sort: sort, order: order, page: page, completion: completion,force: true)
public func getSport(id: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi?,String?) -> Void) {
getSport(id: id, completion: completion,force: true)
}

private func listSport(sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi?,String?) -> Void,force : Bool) {
private func getSport(id: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(sort , forKey: "sort")
params.updateValue(order , forKey: "order")
params.updateValue(page , forKey: "page")
params.updateValue(id , forKey: "id")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/av/list/sport", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v1/av/get/sport", params, completion: { (result, error) in
do{
if let result = result {

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListSportApi
let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_GetSportApi

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.listSport(sort: sort, order: order, page: page, completion: completion,force: false)
self.getSport(id: id, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand Down

0 comments on commit 1a37eb0

Please sign in to comment.