Skip to content

Commit

Permalink
new porto buf 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@siamakrostami
siamakrostami committed Apr 20, 2020
1 parent 417592e commit e7b11b7
Show file tree
Hide file tree
Showing 20 changed files with 1,617 additions and 1,052 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 = 65;
CURRENT_PROJECT_VERSION = 66;
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.9;
MARKETING_VERSION = 0.7.0;
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 = 65;
CURRENT_PROJECT_VERSION = 66;
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.9;
MARKETING_VERSION = 0.7.0;
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.6.9'
s.version = '0.7.0'
s.swift_version = '5'
s.summary = 'vaslAppSdk is a Framework for connectin to Mbas-Vasl service '

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
190 changes: 190 additions & 0 deletions vaslAppSdk/Classes/Module/AvServiceImpl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ protocol AvService {

func listCourseQuestions(sort: String, order: String, page: String, coachCourseId: String, courseName: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListCourseQuestionPackage?,String?) -> Void)

func answerQuestions(athleteCoachId: String, questionPackageId: String, answers: Array<String>, files: Array<String>, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void)

func listAthleteCoursesOfCoach(sort: String, order: String, page: String, athleteId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteCourseOfCoach?,String?) -> Void)

func createProgram(id: String, programs: Array<String>, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void)

func athleteListForNutritionCoach(sort: String, order: String, page: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteRequestsForCoach?,String?) -> Void)

func createDiet(id: String, diets: Array<String>, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void)


}

Expand Down Expand Up @@ -650,4 +660,184 @@ public class AvServiceImpl : AvService {
}


public func answerQuestions(athleteCoachId: String, questionPackageId: String, answers: Array<String>, files: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void) {
answerQuestions(athleteCoachId: athleteCoachId, questionPackageId: questionPackageId, answers: answers, files: files, sessionId: sessionId, completion: completion,force: true)
}

private func answerQuestions(athleteCoachId: String, questionPackageId: String, answers: Array<String>, files: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(athleteCoachId , forKey: "athleteCoachId")
params.updateValue(questionPackageId , forKey: "questionPackageId")
params.updateValue(answers , forKey: "answers")
params.updateValue(files , forKey: "files")
params.updateValue(sessionId , forKey: "sessionId")


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

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.answerQuestions(athleteCoachId: athleteCoachId, questionPackageId: questionPackageId, answers: answers, files: files, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
}
}
}catch{
completion(nil,"")
}
}, force,hasNounce)
}


public func listAthleteCoursesOfCoach(sort: String, order: String, page: String, athleteId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteCourseOfCoach?,String?) -> Void) {
listAthleteCoursesOfCoach(sort: sort, order: order, page: page, athleteId: athleteId, sessionId: sessionId, completion: completion,force: true)
}

private func listAthleteCoursesOfCoach(sort: String, order: String, page: String, athleteId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteCourseOfCoach?,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(athleteId , forKey: "athleteId")
params.updateValue(sessionId , forKey: "sessionId")


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

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteCourseOfCoach(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteCourseOfCoach

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.listAthleteCoursesOfCoach(sort: sort, order: order, page: page, athleteId: athleteId, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
}
}
}catch{
completion(nil,"")
}
}, force,hasNounce)
}


public func createProgram(id: String, programs: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void) {
createProgram(id: id, programs: programs, sessionId: sessionId, completion: completion,force: true)
}

private func createProgram(id: String, programs: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(id , forKey: "id")
params.updateValue(programs , forKey: "programs")
params.updateValue(sessionId , forKey: "sessionId")


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

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.createProgram(id: id, programs: programs, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
}
}
}catch{
completion(nil,"")
}
}, force,hasNounce)
}


public func athleteListForNutritionCoach(sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteRequestsForCoach?,String?) -> Void) {
athleteListForNutritionCoach(sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: true)
}

private func athleteListForNutritionCoach(sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteRequestsForCoach?,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(sessionId , forKey: "sessionId")


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

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteRequestsForCoach(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_ListAthleteRequestsForCoach

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.athleteListForNutritionCoach(sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
}
}
}catch{
completion(nil,"")
}
}, force,hasNounce)
}


public func createDiet(id: String, diets: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void) {
createDiet(id: id, diets: diets, sessionId: sessionId, completion: completion,force: true)
}

private func createDiet(id: String, diets: Array<String>, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(id , forKey: "id")
params.updateValue(diets , forKey: "diets")
params.updateValue(sessionId , forKey: "sessionId")


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

let serviceResponse = try Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General(serializedData: result) as Com_Vasl_Vaslapp_Products_Av_Proto_Holder_General

if serviceResponse.status == PublicValue.status_success {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.createDiet(id: id, diets: diets, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
}
}
}catch{
completion(nil,"")
}
}, force,hasNounce)
}


}

0 comments on commit e7b11b7

Please sign in to comment.