Skip to content

Commit

Permalink
new porto buff
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShimaDarya
ShimaDarya committed May 5, 2020
1 parent 2c9cc80 commit 9aa6af8
Show file tree
Hide file tree
Showing 20 changed files with 1,130 additions and 1,117 deletions.
671 changes: 334 additions & 337 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 = 69;
CURRENT_PROJECT_VERSION = 70;
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.3;
MARKETING_VERSION = 0.7.4;
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 = 69;
CURRENT_PROJECT_VERSION = 70;
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.3;
MARKETING_VERSION = 0.7.4;
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
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
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) {
let params = Dictionary<String,Any>()
var params = Dictionary<String,Any>()


let hasNounce = false
Expand Down

0 comments on commit 9aa6af8

Please sign in to comment.