Skip to content

Commit

Permalink
new version
Browse files Browse the repository at this point in the history
  • Loading branch information
@siamakrostami
siamakrostami committed Mar 30, 2020
1 parent 781ed70 commit 4b555b0
Show file tree
Hide file tree
Showing 12 changed files with 1,477 additions and 2,326 deletions.
640 changes: 320 additions & 320 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 = 63;
CURRENT_PROJECT_VERSION = 64;
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.7;
MARKETING_VERSION = 0.6.8;
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 = 63;
CURRENT_PROJECT_VERSION = 64;
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.7;
MARKETING_VERSION = 0.6.8;
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.7'
s.version = '0.6.8'
s.swift_version = '5'
s.summary = 'vaslAppSdk is a Framework for connectin to Mbas-Vasl service '

Expand Down
340 changes: 170 additions & 170 deletions vaslAppSdk/Classes/Module/ContentServiceV1Impl.swift
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vaslAppSdk/Classes/Module/GameFeaturesServiceV1Impl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class GameFeaturesServiceV1Impl : GameFeaturesServiceV1 {
}

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


let hasNounce = false
Expand Down
26 changes: 13 additions & 13 deletions vaslAppSdk/Classes/Module/GameLeaderBoardServiceV2Impl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ protocol GameLeaderBoardServiceV2 {

func getLeaderBoard(pointId: String, tag: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void)

func getUserInLeaderboard(pointId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void)

func getLeaderboardTop10(pointId: String, tag: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void)

func getUserInLeaderboard(pointId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void)


}

Expand Down Expand Up @@ -50,18 +50,19 @@ public class GameLeaderBoardServiceV2Impl : GameLeaderBoardServiceV2 {
}


public func getUserInLeaderboard(pointId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void) {
getUserInLeaderboard(pointId: pointId, sessionId: sessionId, completion: completion,force: true)
public func getLeaderboardTop10(pointId: String, tag: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void) {
getLeaderboardTop10(pointId: pointId, tag: tag, sessionId: sessionId, completion: completion,force: true)
}

private func getUserInLeaderboard(pointId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void,force : Bool) {
private func getLeaderboardTop10(pointId: String, tag: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(pointId , forKey: "pointId")
params.updateValue(tag , forKey: "tag")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v2/game/leaderboard/user/get", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v2/game/leaderboard/top10", params, completion: { (result, error) in
do{
if let result = result {

Expand All @@ -71,7 +72,7 @@ public class GameLeaderBoardServiceV2Impl : GameLeaderBoardServiceV2 {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.getUserInLeaderboard(pointId: pointId, sessionId: sessionId, completion: completion,force: false)
self.getLeaderboardTop10(pointId: pointId, tag: tag, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand All @@ -84,19 +85,18 @@ public class GameLeaderBoardServiceV2Impl : GameLeaderBoardServiceV2 {
}


public func getLeaderboardTop10(pointId: String, tag: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void) {
getLeaderboardTop10(pointId: pointId, tag: tag, sessionId: sessionId, completion: completion,force: true)
public func getUserInLeaderboard(pointId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void) {
getUserInLeaderboard(pointId: pointId, sessionId: sessionId, completion: completion,force: true)
}

private func getLeaderboardTop10(pointId: String, tag: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void,force : Bool) {
private func getUserInLeaderboard(pointId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_GetLeaderBoard?,String?) -> Void,force : Bool) {
var params = Dictionary<String,Any>()
params.updateValue(pointId , forKey: "pointId")
params.updateValue(tag , forKey: "tag")
params.updateValue(sessionId , forKey: "sessionId")


let hasNounce = false
RestService.post(url: PublicValue.getUrlBase() + "/api/v2/game/leaderboard/top10", params, completion: { (result, error) in
RestService.post(url: PublicValue.getUrlBase() + "/api/v2/game/leaderboard/user/get", params, completion: { (result, error) in
do{
if let result = result {

Expand All @@ -106,7 +106,7 @@ public class GameLeaderBoardServiceV2Impl : GameLeaderBoardServiceV2 {
completion(serviceResponse,nil)
} else {
if serviceResponse.code == 401 && force {
self.getLeaderboardTop10(pointId: pointId, tag: tag, sessionId: sessionId, completion: completion,force: false)
self.getUserInLeaderboard(pointId: pointId, sessionId: sessionId, completion: completion,force: false)
}else{
completion(serviceResponse,serviceResponse.msg)
}
Expand Down
72 changes: 36 additions & 36 deletions vaslAppSdk/Classes/Module/HambaziServiceV1Impl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ protocol HambaziServiceV1 {

func adminComment(videoId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_AdminCommentList?,String?) -> Void)

func getBanner(id: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_BannerGet?,String?) -> Void)

func listCategory(page: String, keyWord: String, sort: String, order: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_CategoryList?,String?) -> Void)

func listCategoryRoots(completion : @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_CategoryList?,String?) -> Void)
Expand All @@ -68,6 +66,8 @@ protocol HambaziServiceV1 {

func listCategoryClustered(page: String, keyWord: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_CategoryListCllustered?,String?) -> Void)

func getBanner(id: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_BannerGet?,String?) -> Void)


}

Expand Down Expand Up @@ -1087,40 +1087,6 @@ public class HambaziServiceV1Impl : HambaziServiceV1 {
}


public func getBanner(id: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_BannerGet?,String?) -> Void) {
getBanner(id: id, sessionId: sessionId, completion: completion,force: true)
}

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


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

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

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


public func listCategory(page: String, keyWord: String, sort: String, order: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_CategoryList?,String?) -> Void) {
listCategory(page: page, keyWord: keyWord, sort: sort, order: order, completion: completion,force: true)
}
Expand Down Expand Up @@ -1258,4 +1224,38 @@ public class HambaziServiceV1Impl : HambaziServiceV1 {
}


public func getBanner(id: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Hambazi_Proto_Holder_BannerGet?,String?) -> Void) {
getBanner(id: id, sessionId: sessionId, completion: completion,force: true)
}

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


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

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

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


}

0 comments on commit 4b555b0

Please sign in to comment.