From 1a37eb0a55e486667600e12ee99a7fa47c8626f2 Mon Sep 17 00:00:00 2001 From: siamak Date: Wed, 22 Apr 2020 15:01:22 +0430 Subject: [PATCH] login --- Example/Pods/Pods.xcodeproj/project.pbxproj | 648 +++++++++--------- Example/vaslAppSdk.xcodeproj/project.pbxproj | 8 +- vaslAppSdk.podspec | 2 +- .../Module/AnalyticServiceV1Impl.swift | 26 +- .../Classes/Module/AppServicesImpl.swift | 2 +- vaslAppSdk/Classes/Module/AvServiceImpl.swift | 36 +- .../Classes/Module/ContentServiceV1Impl.swift | 298 ++++---- .../Module/GameFeaturesServiceV1Impl.swift | 2 +- .../Module/GameUsersServiceV1Impl.swift | 2 +- .../Classes/Module/GeoServiceV1Impl.swift | 78 +-- .../Classes/Module/KalingaServiceV1Impl.swift | 4 +- .../Classes/Module/LeagueServiceV1Impl.swift | 76 +- .../Classes/Module/PazhServiceV1Impl.swift | 176 ++--- .../Classes/Module/PushFCMServiceV1Impl.swift | 50 +- .../Classes/Module/ShopServiceV1Impl.swift | 124 ++-- .../Module/SubscriberServiceV1Impl.swift | 122 ++-- .../Module/SubscriberServiceV1_1Impl.swift | 46 +- .../Module/SubscriberServiceV2Impl.swift | 214 +++--- 18 files changed, 957 insertions(+), 957 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 3245f26..d25c44d 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,87 +7,87 @@ objects = { /* Begin PBXBuildFile section */ - 0145F6AF244DDE5B0083AA37 /* GameActionServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F683244DDE550083AA37 /* GameActionServiceV2Impl.swift */; }; - 0145F6B0244DDE5B0083AA37 /* FileManagerServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F684244DDE560083AA37 /* FileManagerServiceV1Impl.swift */; }; - 0145F6B1244DDE5B0083AA37 /* PushFCMServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F685244DDE560083AA37 /* PushFCMServiceV1Impl.swift */; }; - 0145F6B2244DDE5B0083AA37 /* EmailControllerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F686244DDE560083AA37 /* EmailControllerImpl.swift */; }; - 0145F6B3244DDE5B0083AA37 /* GatewayServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F687244DDE560083AA37 /* GatewayServiceV1Impl.swift */; }; - 0145F6B4244DDE5B0083AA37 /* PushControllerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F688244DDE560083AA37 /* PushControllerImpl.swift */; }; - 0145F6B5244DDE5B0083AA37 /* AnalyticServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F689244DDE560083AA37 /* AnalyticServiceV1Impl.swift */; }; - 0145F6B6244DDE5B0083AA37 /* OperatorsServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F68A244DDE560083AA37 /* OperatorsServiceV1Impl.swift */; }; - 0145F6B7244DDE5B0083AA37 /* SubscriberServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F68B244DDE560083AA37 /* SubscriberServiceV2Impl.swift */; }; - 0145F6B8244DDE5B0083AA37 /* DynamicTableServiceEndpointsV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F68C244DDE560083AA37 /* DynamicTableServiceEndpointsV1Impl.swift */; }; - 0145F6B9244DDE5B0083AA37 /* GameUsersServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F68D244DDE570083AA37 /* GameUsersServiceV1Impl.swift */; }; - 0145F6BA244DDE5C0083AA37 /* DynamicTableServiceTablesV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F68E244DDE570083AA37 /* DynamicTableServiceTablesV1Impl.swift */; }; - 0145F6BB244DDE5C0083AA37 /* GameUserServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F68F244DDE570083AA37 /* GameUserServiceV2Impl.swift */; }; - 0145F6BC244DDE5C0083AA37 /* billingImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F690244DDE570083AA37 /* billingImpl.swift */; }; - 0145F6BD244DDE5C0083AA37 /* ContentServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F691244DDE570083AA37 /* ContentServiceV1Impl.swift */; }; - 0145F6BE244DDE5C0083AA37 /* AppVersionServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F692244DDE570083AA37 /* AppVersionServiceV1Impl.swift */; }; - 0145F6BF244DDE5C0083AA37 /* MgsServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F693244DDE570083AA37 /* MgsServiceV1Impl.swift */; }; - 0145F6C0244DDE5C0083AA37 /* GameLeaderBoardServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F694244DDE580083AA37 /* GameLeaderBoardServiceV1Impl.swift */; }; - 0145F6C1244DDE5C0083AA37 /* ReferralServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F695244DDE580083AA37 /* ReferralServiceV1Impl.swift */; }; - 0145F6C2244DDE5C0083AA37 /* SubscriberServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F696244DDE580083AA37 /* SubscriberServiceV1Impl.swift */; }; - 0145F6C3244DDE5C0083AA37 /* LeagueServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F697244DDE580083AA37 /* LeagueServiceV1Impl.swift */; }; - 0145F6C4244DDE5C0083AA37 /* SupportServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F698244DDE580083AA37 /* SupportServiceV1Impl.swift */; }; - 0145F6C6244DDE5C0083AA37 /* EventServiceImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F69A244DDE590083AA37 /* EventServiceImpl.swift */; }; - 0145F6C7244DDE5C0083AA37 /* AvatarServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F69B244DDE590083AA37 /* AvatarServiceV1Impl.swift */; }; - 0145F6C8244DDE5C0083AA37 /* GameFeaturesServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F69C244DDE590083AA37 /* GameFeaturesServiceV1Impl.swift */; }; - 0145F6C9244DDE5C0083AA37 /* BillingInappServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F69D244DDE590083AA37 /* BillingInappServiceV1Impl.swift */; }; - 0145F6CA244DDE5C0083AA37 /* AppServicesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F69E244DDE590083AA37 /* AppServicesImpl.swift */; }; - 0145F6CB244DDE5C0083AA37 /* GamePointServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F69F244DDE590083AA37 /* GamePointServiceV2Impl.swift */; }; - 0145F6CC244DDE5C0083AA37 /* GamePointTypeServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A0244DDE5A0083AA37 /* GamePointTypeServiceV1Impl.swift */; }; - 0145F6CD244DDE5C0083AA37 /* GeoServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A1244DDE5A0083AA37 /* GeoServiceV1Impl.swift */; }; - 0145F6CE244DDE5C0083AA37 /* GameLeaderBoardServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A2244DDE5A0083AA37 /* GameLeaderBoardServiceV2Impl.swift */; }; - 0145F6CF244DDE5C0083AA37 /* ShopServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A3244DDE5A0083AA37 /* ShopServiceV1Impl.swift */; }; - 0145F6D0244DDE5C0083AA37 /* SubscriberServiceV1_1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A4244DDE5A0083AA37 /* SubscriberServiceV1_1Impl.swift */; }; - 0145F6D1244DDE5C0083AA37 /* GameFeaturesServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A5244DDE5A0083AA37 /* GameFeaturesServiceV2Impl.swift */; }; - 0145F6D2244DDE5C0083AA37 /* AvServiceImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A6244DDE5B0083AA37 /* AvServiceImpl.swift */; }; - 0145F6D3244DDE5C0083AA37 /* GameActionServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A7244DDE5B0083AA37 /* GameActionServiceV1Impl.swift */; }; - 0145F6D4244DDE5C0083AA37 /* DynamicLinkServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A8244DDE5B0083AA37 /* DynamicLinkServiceV1Impl.swift */; }; - 0145F6D5244DDE5C0083AA37 /* KalingaServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6A9244DDE5B0083AA37 /* KalingaServiceV1Impl.swift */; }; - 0145F6D6244DDE5C0083AA37 /* HambaziServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6AA244DDE5B0083AA37 /* HambaziServiceV1Impl.swift */; }; - 0145F6D7244DDE5C0083AA37 /* ChargeServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6AB244DDE5B0083AA37 /* ChargeServiceV1Impl.swift */; }; - 0145F6D8244DDE5C0083AA37 /* PazhServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6AC244DDE5B0083AA37 /* PazhServiceV1Impl.swift */; }; - 0145F6D9244DDE5C0083AA37 /* UserDeviceControllerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6AD244DDE5B0083AA37 /* UserDeviceControllerImpl.swift */; }; - 0145F6DA244DDE5C0083AA37 /* EventManagerServiceImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6AE244DDE5B0083AA37 /* EventManagerServiceImpl.swift */; }; - 0145F701244DDEA80083AA37 /* Game.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6DB244DDEA50083AA37 /* Game.pb.swift */; }; - 0145F702244DDEA80083AA37 /* Health.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6DC244DDEA50083AA37 /* Health.pb.swift */; }; - 0145F703244DDEA80083AA37 /* CommentGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6DD244DDEA50083AA37 /* CommentGlobal.pb.swift */; }; - 0145F704244DDEA80083AA37 /* GateWay.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6DE244DDEA50083AA37 /* GateWay.pb.swift */; }; - 0145F705244DDEA80083AA37 /* Global.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6DF244DDEA50083AA37 /* Global.pb.swift */; }; - 0145F706244DDEA80083AA37 /* Notification.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E0244DDEA50083AA37 /* Notification.pb.swift */; }; - 0145F707244DDEA80083AA37 /* AppGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E1244DDEA50083AA37 /* AppGlobal.pb.swift */; }; - 0145F708244DDEA80083AA37 /* GeoGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E2244DDEA50083AA37 /* GeoGlobalV1.pb.swift */; }; - 0145F709244DDEA80083AA37 /* Mgs.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E3244DDEA50083AA37 /* Mgs.pb.swift */; }; - 0145F70A244DDEA80083AA37 /* ContentGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E4244DDEA50083AA37 /* ContentGlobalV1.pb.swift */; }; - 0145F70B244DDEA80083AA37 /* Billing.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E5244DDEA50083AA37 /* Billing.pb.swift */; }; - 0145F70C244DDEA80083AA37 /* MobileConnect.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E6244DDEA50083AA37 /* MobileConnect.pb.swift */; }; - 0145F70D244DDEA80083AA37 /* EventGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E7244DDEA50083AA37 /* EventGlobal.pb.swift */; }; - 0145F70E244DDEA80083AA37 /* Poll.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E8244DDEA60083AA37 /* Poll.pb.swift */; }; - 0145F70F244DDEA80083AA37 /* ReferralGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6E9244DDEA60083AA37 /* ReferralGlobal.pb.swift */; }; - 0145F710244DDEA80083AA37 /* Subscriber.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6EA244DDEA60083AA37 /* Subscriber.pb.swift */; }; - 0145F711244DDEA80083AA37 /* FileGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6EB244DDEA60083AA37 /* FileGlobal.pb.swift */; }; - 0145F712244DDEA80083AA37 /* AnalyticGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6EC244DDEA60083AA37 /* AnalyticGlobal.pb.swift */; }; - 0145F713244DDEA80083AA37 /* Packets.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6ED244DDEA60083AA37 /* Packets.pb.swift */; }; - 0145F714244DDEA80083AA37 /* Pazh.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6EE244DDEA60083AA37 /* Pazh.pb.swift */; }; - 0145F715244DDEA80083AA37 /* Shop.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6EF244DDEA60083AA37 /* Shop.pb.swift */; }; - 0145F716244DDEA80083AA37 /* TimerGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F0244DDEA60083AA37 /* TimerGlobal.pb.swift */; }; - 0145F717244DDEA80083AA37 /* GameLeague.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F1244DDEA60083AA37 /* GameLeague.pb.swift */; }; - 0145F718244DDEA80083AA37 /* AvatarGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F2244DDEA60083AA37 /* AvatarGlobalV1.pb.swift */; }; - 0145F719244DDEA80083AA37 /* BillingInappGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F3244DDEA60083AA37 /* BillingInappGlobal.pb.swift */; }; - 0145F71A244DDEA80083AA37 /* AppVersion.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F4244DDEA70083AA37 /* AppVersion.pb.swift */; }; - 0145F71B244DDEA80083AA37 /* Av.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F5244DDEA70083AA37 /* Av.pb.swift */; }; - 0145F71C244DDEA80083AA37 /* DynamicLink.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F6244DDEA70083AA37 /* DynamicLink.pb.swift */; }; - 0145F71D244DDEA80083AA37 /* setting.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F7244DDEA70083AA37 /* setting.pb.swift */; }; - 0145F71E244DDEA80083AA37 /* EngagementChanelGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F8244DDEA70083AA37 /* EngagementChanelGlobal.pb.swift */; }; - 0145F71F244DDEA80083AA37 /* OperatorsGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6F9244DDEA70083AA37 /* OperatorsGlobalV1.pb.swift */; }; - 0145F720244DDEA80083AA37 /* PushFCMGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6FA244DDEA70083AA37 /* PushFCMGlobal.pb.swift */; }; - 0145F721244DDEA80083AA37 /* Hambazi.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6FB244DDEA70083AA37 /* Hambazi.pb.swift */; }; - 0145F722244DDEA80083AA37 /* ChargeCard.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6FC244DDEA70083AA37 /* ChargeCard.pb.swift */; }; - 0145F723244DDEA80083AA37 /* SupportGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6FD244DDEA70083AA37 /* SupportGlobal.pb.swift */; }; - 0145F724244DDEA80083AA37 /* EventManager.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6FE244DDEA70083AA37 /* EventManager.pb.swift */; }; - 0145F725244DDEA80083AA37 /* client.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F6FF244DDEA80083AA37 /* client.pb.swift */; }; - 0145F726244DDEA80083AA37 /* DynamicTable.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0145F700244DDEA80083AA37 /* DynamicTable.pb.swift */; }; + 01A89B52245052E00034D2B7 /* EmailControllerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B26245052DA0034D2B7 /* EmailControllerImpl.swift */; }; + 01A89B53245052E00034D2B7 /* GameActionServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B27245052DA0034D2B7 /* GameActionServiceV2Impl.swift */; }; + 01A89B54245052E00034D2B7 /* PazhServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B28245052DA0034D2B7 /* PazhServiceV1Impl.swift */; }; + 01A89B55245052E00034D2B7 /* PushControllerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B29245052DA0034D2B7 /* PushControllerImpl.swift */; }; + 01A89B56245052E00034D2B7 /* DynamicTableServiceTablesV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B2A245052DA0034D2B7 /* DynamicTableServiceTablesV1Impl.swift */; }; + 01A89B57245052E00034D2B7 /* GamePointServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B2B245052DA0034D2B7 /* GamePointServiceV2Impl.swift */; }; + 01A89B58245052E00034D2B7 /* ContentServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B2C245052DA0034D2B7 /* ContentServiceV1Impl.swift */; }; + 01A89B59245052E00034D2B7 /* PushFCMServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B2D245052DA0034D2B7 /* PushFCMServiceV1Impl.swift */; }; + 01A89B5A245052E00034D2B7 /* ReferralServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B2E245052DB0034D2B7 /* ReferralServiceV1Impl.swift */; }; + 01A89B5B245052E00034D2B7 /* SubscriberServiceV1_1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B2F245052DB0034D2B7 /* SubscriberServiceV1_1Impl.swift */; }; + 01A89B5C245052E00034D2B7 /* SupportServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B30245052DB0034D2B7 /* SupportServiceV1Impl.swift */; }; + 01A89B5D245052E00034D2B7 /* EventManagerServiceImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B31245052DB0034D2B7 /* EventManagerServiceImpl.swift */; }; + 01A89B5E245052E00034D2B7 /* UserDeviceControllerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B32245052DB0034D2B7 /* UserDeviceControllerImpl.swift */; }; + 01A89B5F245052E00034D2B7 /* GatewayServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B33245052DB0034D2B7 /* GatewayServiceV1Impl.swift */; }; + 01A89B60245052E00034D2B7 /* GeoServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B34245052DC0034D2B7 /* GeoServiceV1Impl.swift */; }; + 01A89B61245052E00034D2B7 /* GameLeaderBoardServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B35245052DC0034D2B7 /* GameLeaderBoardServiceV2Impl.swift */; }; + 01A89B62245052E00034D2B7 /* GameUsersServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B36245052DC0034D2B7 /* GameUsersServiceV1Impl.swift */; }; + 01A89B63245052E00034D2B7 /* HambaziServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B37245052DC0034D2B7 /* HambaziServiceV1Impl.swift */; }; + 01A89B64245052E00034D2B7 /* AppServicesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B38245052DC0034D2B7 /* AppServicesImpl.swift */; }; + 01A89B65245052E00034D2B7 /* KalingaServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B39245052DC0034D2B7 /* KalingaServiceV1Impl.swift */; }; + 01A89B66245052E00034D2B7 /* GameFeaturesServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B3A245052DD0034D2B7 /* GameFeaturesServiceV1Impl.swift */; }; + 01A89B67245052E00034D2B7 /* SubscriberServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B3B245052DD0034D2B7 /* SubscriberServiceV2Impl.swift */; }; + 01A89B68245052E00034D2B7 /* GameActionServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B3C245052DD0034D2B7 /* GameActionServiceV1Impl.swift */; }; + 01A89B69245052E00034D2B7 /* billingImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B3D245052DD0034D2B7 /* billingImpl.swift */; }; + 01A89B6A245052E00034D2B7 /* DynamicTableServiceEndpointsV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B3E245052DD0034D2B7 /* DynamicTableServiceEndpointsV1Impl.swift */; }; + 01A89B6B245052E00034D2B7 /* GamePointTypeServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B3F245052DD0034D2B7 /* GamePointTypeServiceV1Impl.swift */; }; + 01A89B6C245052E00034D2B7 /* AvatarServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B40245052DE0034D2B7 /* AvatarServiceV1Impl.swift */; }; + 01A89B6D245052E00034D2B7 /* ChargeServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B41245052DE0034D2B7 /* ChargeServiceV1Impl.swift */; }; + 01A89B6E245052E00034D2B7 /* EventServiceImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B42245052DE0034D2B7 /* EventServiceImpl.swift */; }; + 01A89B6F245052E00034D2B7 /* AnalyticServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B43245052DE0034D2B7 /* AnalyticServiceV1Impl.swift */; }; + 01A89B70245052E00034D2B7 /* AvServiceImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B44245052DE0034D2B7 /* AvServiceImpl.swift */; }; + 01A89B71245052E00034D2B7 /* ShopServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B45245052DE0034D2B7 /* ShopServiceV1Impl.swift */; }; + 01A89B72245052E00034D2B7 /* AppVersionServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B46245052DE0034D2B7 /* AppVersionServiceV1Impl.swift */; }; + 01A89B73245052E00034D2B7 /* SubscriberServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B47245052DE0034D2B7 /* SubscriberServiceV1Impl.swift */; }; + 01A89B74245052E00034D2B7 /* GameLeaderBoardServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B48245052DE0034D2B7 /* GameLeaderBoardServiceV1Impl.swift */; }; + 01A89B75245052E00034D2B7 /* GameUserServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B49245052DF0034D2B7 /* GameUserServiceV2Impl.swift */; }; + 01A89B76245052E00034D2B7 /* DynamicLinkServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B4A245052DF0034D2B7 /* DynamicLinkServiceV1Impl.swift */; }; + 01A89B77245052E00034D2B7 /* MgsServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B4B245052DF0034D2B7 /* MgsServiceV1Impl.swift */; }; + 01A89B78245052E00034D2B7 /* FileManagerServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B4C245052DF0034D2B7 /* FileManagerServiceV1Impl.swift */; }; + 01A89B79245052E00034D2B7 /* GameFeaturesServiceV2Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B4D245052DF0034D2B7 /* GameFeaturesServiceV2Impl.swift */; }; + 01A89B7A245052E00034D2B7 /* BillingInappServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B4E245052DF0034D2B7 /* BillingInappServiceV1Impl.swift */; }; + 01A89B7B245052E00034D2B7 /* OperatorsServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B4F245052E00034D2B7 /* OperatorsServiceV1Impl.swift */; }; + 01A89B7C245052E00034D2B7 /* LeagueServiceV1Impl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B50245052E00034D2B7 /* LeagueServiceV1Impl.swift */; }; + 01A89BA42450532D0034D2B7 /* Pazh.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B7E245053280034D2B7 /* Pazh.pb.swift */; }; + 01A89BA52450532D0034D2B7 /* OperatorsGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B7F245053280034D2B7 /* OperatorsGlobalV1.pb.swift */; }; + 01A89BA62450532D0034D2B7 /* GeoGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B80245053280034D2B7 /* GeoGlobalV1.pb.swift */; }; + 01A89BA72450532D0034D2B7 /* Shop.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B81245053280034D2B7 /* Shop.pb.swift */; }; + 01A89BA82450532D0034D2B7 /* AnalyticGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B82245053280034D2B7 /* AnalyticGlobal.pb.swift */; }; + 01A89BA92450532D0034D2B7 /* Billing.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B83245053280034D2B7 /* Billing.pb.swift */; }; + 01A89BAA2450532D0034D2B7 /* Mgs.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B84245053280034D2B7 /* Mgs.pb.swift */; }; + 01A89BAB2450532D0034D2B7 /* SupportGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B85245053280034D2B7 /* SupportGlobal.pb.swift */; }; + 01A89BAC2450532D0034D2B7 /* DynamicLink.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B86245053280034D2B7 /* DynamicLink.pb.swift */; }; + 01A89BAD2450532D0034D2B7 /* GameLeague.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B87245053280034D2B7 /* GameLeague.pb.swift */; }; + 01A89BAE2450532D0034D2B7 /* AppVersion.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B88245053290034D2B7 /* AppVersion.pb.swift */; }; + 01A89BAF2450532D0034D2B7 /* Hambazi.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B89245053290034D2B7 /* Hambazi.pb.swift */; }; + 01A89BB02450532D0034D2B7 /* Poll.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B8A245053290034D2B7 /* Poll.pb.swift */; }; + 01A89BB12450532D0034D2B7 /* EventGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B8B245053290034D2B7 /* EventGlobal.pb.swift */; }; + 01A89BB22450532D0034D2B7 /* FileGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B8C245053290034D2B7 /* FileGlobal.pb.swift */; }; + 01A89BB32450532D0034D2B7 /* Subscriber.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B8D245053290034D2B7 /* Subscriber.pb.swift */; }; + 01A89BB42450532D0034D2B7 /* TimerGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B8E245053290034D2B7 /* TimerGlobal.pb.swift */; }; + 01A89BB52450532D0034D2B7 /* client.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B8F245053290034D2B7 /* client.pb.swift */; }; + 01A89BB62450532D0034D2B7 /* Av.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B90245053290034D2B7 /* Av.pb.swift */; }; + 01A89BB72450532D0034D2B7 /* ContentGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B91245053290034D2B7 /* ContentGlobalV1.pb.swift */; }; + 01A89BB82450532D0034D2B7 /* Packets.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B92245053290034D2B7 /* Packets.pb.swift */; }; + 01A89BB92450532D0034D2B7 /* AppGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B93245053290034D2B7 /* AppGlobal.pb.swift */; }; + 01A89BBA2450532D0034D2B7 /* EngagementChanelGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B942450532A0034D2B7 /* EngagementChanelGlobal.pb.swift */; }; + 01A89BBB2450532D0034D2B7 /* DynamicTable.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B952450532A0034D2B7 /* DynamicTable.pb.swift */; }; + 01A89BBC2450532D0034D2B7 /* CommentGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B962450532A0034D2B7 /* CommentGlobal.pb.swift */; }; + 01A89BBD2450532D0034D2B7 /* ChargeCard.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B972450532A0034D2B7 /* ChargeCard.pb.swift */; }; + 01A89BBE2450532D0034D2B7 /* EventManager.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B982450532A0034D2B7 /* EventManager.pb.swift */; }; + 01A89BBF2450532D0034D2B7 /* GateWay.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B992450532C0034D2B7 /* GateWay.pb.swift */; }; + 01A89BC02450532D0034D2B7 /* Health.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B9A2450532C0034D2B7 /* Health.pb.swift */; }; + 01A89BC12450532D0034D2B7 /* AvatarGlobalV1.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B9B2450532C0034D2B7 /* AvatarGlobalV1.pb.swift */; }; + 01A89BC22450532D0034D2B7 /* setting.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B9C2450532C0034D2B7 /* setting.pb.swift */; }; + 01A89BC32450532D0034D2B7 /* MobileConnect.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B9D2450532C0034D2B7 /* MobileConnect.pb.swift */; }; + 01A89BC42450532D0034D2B7 /* BillingInappGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B9E2450532D0034D2B7 /* BillingInappGlobal.pb.swift */; }; + 01A89BC52450532D0034D2B7 /* Game.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89B9F2450532D0034D2B7 /* Game.pb.swift */; }; + 01A89BC62450532D0034D2B7 /* Global.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89BA02450532D0034D2B7 /* Global.pb.swift */; }; + 01A89BC72450532D0034D2B7 /* Notification.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89BA12450532D0034D2B7 /* Notification.pb.swift */; }; + 01A89BC82450532D0034D2B7 /* ReferralGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89BA22450532D0034D2B7 /* ReferralGlobal.pb.swift */; }; + 01A89BC92450532D0034D2B7 /* PushFCMGlobal.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A89BA32450532D0034D2B7 /* PushFCMGlobal.pb.swift */; }; 0306324FB55AB79F74A36E63BF1B0B81 /* BinaryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 282A4F19ABB2DB57B9D74476AAF1DAEF /* BinaryEncoder.swift */; }; 0370DD7976BF534338E354D6FB0BBF0E /* AnyMessageStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B56334DBF89819ED06958A557518C86 /* AnyMessageStorage.swift */; }; 05428251AAD926AF0CAA2E133AF73EC1 /* JSONMapEncodingVisitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9D28CBB6A0C2B0474C765331031FF8 /* JSONMapEncodingVisitor.swift */; }; @@ -268,87 +268,87 @@ /* Begin PBXFileReference section */ 004C721B7A3DD008BF7047384FC2F966 /* Pods_vaslAppSdk_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_vaslAppSdk_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 013D7325F720211219F768355C533044 /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = ""; }; - 0145F683244DDE550083AA37 /* GameActionServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameActionServiceV2Impl.swift; sourceTree = ""; }; - 0145F684244DDE560083AA37 /* FileManagerServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileManagerServiceV1Impl.swift; sourceTree = ""; }; - 0145F685244DDE560083AA37 /* PushFCMServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushFCMServiceV1Impl.swift; sourceTree = ""; }; - 0145F686244DDE560083AA37 /* EmailControllerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailControllerImpl.swift; sourceTree = ""; }; - 0145F687244DDE560083AA37 /* GatewayServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GatewayServiceV1Impl.swift; sourceTree = ""; }; - 0145F688244DDE560083AA37 /* PushControllerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushControllerImpl.swift; sourceTree = ""; }; - 0145F689244DDE560083AA37 /* AnalyticServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticServiceV1Impl.swift; sourceTree = ""; }; - 0145F68A244DDE560083AA37 /* OperatorsServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperatorsServiceV1Impl.swift; sourceTree = ""; }; - 0145F68B244DDE560083AA37 /* SubscriberServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriberServiceV2Impl.swift; sourceTree = ""; }; - 0145F68C244DDE560083AA37 /* DynamicTableServiceEndpointsV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicTableServiceEndpointsV1Impl.swift; sourceTree = ""; }; - 0145F68D244DDE570083AA37 /* GameUsersServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameUsersServiceV1Impl.swift; sourceTree = ""; }; - 0145F68E244DDE570083AA37 /* DynamicTableServiceTablesV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicTableServiceTablesV1Impl.swift; sourceTree = ""; }; - 0145F68F244DDE570083AA37 /* GameUserServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameUserServiceV2Impl.swift; sourceTree = ""; }; - 0145F690244DDE570083AA37 /* billingImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = billingImpl.swift; sourceTree = ""; }; - 0145F691244DDE570083AA37 /* ContentServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentServiceV1Impl.swift; sourceTree = ""; }; - 0145F692244DDE570083AA37 /* AppVersionServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppVersionServiceV1Impl.swift; sourceTree = ""; }; - 0145F693244DDE570083AA37 /* MgsServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MgsServiceV1Impl.swift; sourceTree = ""; }; - 0145F694244DDE580083AA37 /* GameLeaderBoardServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameLeaderBoardServiceV1Impl.swift; sourceTree = ""; }; - 0145F695244DDE580083AA37 /* ReferralServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReferralServiceV1Impl.swift; sourceTree = ""; }; - 0145F696244DDE580083AA37 /* SubscriberServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriberServiceV1Impl.swift; sourceTree = ""; }; - 0145F697244DDE580083AA37 /* LeagueServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeagueServiceV1Impl.swift; sourceTree = ""; }; - 0145F698244DDE580083AA37 /* SupportServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportServiceV1Impl.swift; sourceTree = ""; }; - 0145F69A244DDE590083AA37 /* EventServiceImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventServiceImpl.swift; sourceTree = ""; }; - 0145F69B244DDE590083AA37 /* AvatarServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarServiceV1Impl.swift; sourceTree = ""; }; - 0145F69C244DDE590083AA37 /* GameFeaturesServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameFeaturesServiceV1Impl.swift; sourceTree = ""; }; - 0145F69D244DDE590083AA37 /* BillingInappServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BillingInappServiceV1Impl.swift; sourceTree = ""; }; - 0145F69E244DDE590083AA37 /* AppServicesImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppServicesImpl.swift; sourceTree = ""; }; - 0145F69F244DDE590083AA37 /* GamePointServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamePointServiceV2Impl.swift; sourceTree = ""; }; - 0145F6A0244DDE5A0083AA37 /* GamePointTypeServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamePointTypeServiceV1Impl.swift; sourceTree = ""; }; - 0145F6A1244DDE5A0083AA37 /* GeoServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeoServiceV1Impl.swift; sourceTree = ""; }; - 0145F6A2244DDE5A0083AA37 /* GameLeaderBoardServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameLeaderBoardServiceV2Impl.swift; sourceTree = ""; }; - 0145F6A3244DDE5A0083AA37 /* ShopServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShopServiceV1Impl.swift; sourceTree = ""; }; - 0145F6A4244DDE5A0083AA37 /* SubscriberServiceV1_1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriberServiceV1_1Impl.swift; sourceTree = ""; }; - 0145F6A5244DDE5A0083AA37 /* GameFeaturesServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameFeaturesServiceV2Impl.swift; sourceTree = ""; }; - 0145F6A6244DDE5B0083AA37 /* AvServiceImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvServiceImpl.swift; sourceTree = ""; }; - 0145F6A7244DDE5B0083AA37 /* GameActionServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameActionServiceV1Impl.swift; sourceTree = ""; }; - 0145F6A8244DDE5B0083AA37 /* DynamicLinkServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicLinkServiceV1Impl.swift; sourceTree = ""; }; - 0145F6A9244DDE5B0083AA37 /* KalingaServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KalingaServiceV1Impl.swift; sourceTree = ""; }; - 0145F6AA244DDE5B0083AA37 /* HambaziServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HambaziServiceV1Impl.swift; sourceTree = ""; }; - 0145F6AB244DDE5B0083AA37 /* ChargeServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChargeServiceV1Impl.swift; sourceTree = ""; }; - 0145F6AC244DDE5B0083AA37 /* PazhServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PazhServiceV1Impl.swift; sourceTree = ""; }; - 0145F6AD244DDE5B0083AA37 /* UserDeviceControllerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDeviceControllerImpl.swift; sourceTree = ""; }; - 0145F6AE244DDE5B0083AA37 /* EventManagerServiceImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventManagerServiceImpl.swift; sourceTree = ""; }; - 0145F6DB244DDEA50083AA37 /* Game.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Game.pb.swift; sourceTree = ""; }; - 0145F6DC244DDEA50083AA37 /* Health.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Health.pb.swift; sourceTree = ""; }; - 0145F6DD244DDEA50083AA37 /* CommentGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentGlobal.pb.swift; sourceTree = ""; }; - 0145F6DE244DDEA50083AA37 /* GateWay.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GateWay.pb.swift; sourceTree = ""; }; - 0145F6DF244DDEA50083AA37 /* Global.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Global.pb.swift; sourceTree = ""; }; - 0145F6E0244DDEA50083AA37 /* Notification.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Notification.pb.swift; sourceTree = ""; }; - 0145F6E1244DDEA50083AA37 /* AppGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppGlobal.pb.swift; sourceTree = ""; }; - 0145F6E2244DDEA50083AA37 /* GeoGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeoGlobalV1.pb.swift; sourceTree = ""; }; - 0145F6E3244DDEA50083AA37 /* Mgs.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mgs.pb.swift; sourceTree = ""; }; - 0145F6E4244DDEA50083AA37 /* ContentGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentGlobalV1.pb.swift; sourceTree = ""; }; - 0145F6E5244DDEA50083AA37 /* Billing.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Billing.pb.swift; sourceTree = ""; }; - 0145F6E6244DDEA50083AA37 /* MobileConnect.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MobileConnect.pb.swift; sourceTree = ""; }; - 0145F6E7244DDEA50083AA37 /* EventGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventGlobal.pb.swift; sourceTree = ""; }; - 0145F6E8244DDEA60083AA37 /* Poll.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Poll.pb.swift; sourceTree = ""; }; - 0145F6E9244DDEA60083AA37 /* ReferralGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReferralGlobal.pb.swift; sourceTree = ""; }; - 0145F6EA244DDEA60083AA37 /* Subscriber.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscriber.pb.swift; sourceTree = ""; }; - 0145F6EB244DDEA60083AA37 /* FileGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileGlobal.pb.swift; sourceTree = ""; }; - 0145F6EC244DDEA60083AA37 /* AnalyticGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticGlobal.pb.swift; sourceTree = ""; }; - 0145F6ED244DDEA60083AA37 /* Packets.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Packets.pb.swift; sourceTree = ""; }; - 0145F6EE244DDEA60083AA37 /* Pazh.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pazh.pb.swift; sourceTree = ""; }; - 0145F6EF244DDEA60083AA37 /* Shop.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Shop.pb.swift; sourceTree = ""; }; - 0145F6F0244DDEA60083AA37 /* TimerGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimerGlobal.pb.swift; sourceTree = ""; }; - 0145F6F1244DDEA60083AA37 /* GameLeague.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameLeague.pb.swift; sourceTree = ""; }; - 0145F6F2244DDEA60083AA37 /* AvatarGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarGlobalV1.pb.swift; sourceTree = ""; }; - 0145F6F3244DDEA60083AA37 /* BillingInappGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BillingInappGlobal.pb.swift; sourceTree = ""; }; - 0145F6F4244DDEA70083AA37 /* AppVersion.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppVersion.pb.swift; sourceTree = ""; }; - 0145F6F5244DDEA70083AA37 /* Av.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Av.pb.swift; sourceTree = ""; }; - 0145F6F6244DDEA70083AA37 /* DynamicLink.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicLink.pb.swift; sourceTree = ""; }; - 0145F6F7244DDEA70083AA37 /* setting.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = setting.pb.swift; sourceTree = ""; }; - 0145F6F8244DDEA70083AA37 /* EngagementChanelGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EngagementChanelGlobal.pb.swift; sourceTree = ""; }; - 0145F6F9244DDEA70083AA37 /* OperatorsGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperatorsGlobalV1.pb.swift; sourceTree = ""; }; - 0145F6FA244DDEA70083AA37 /* PushFCMGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushFCMGlobal.pb.swift; sourceTree = ""; }; - 0145F6FB244DDEA70083AA37 /* Hambazi.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Hambazi.pb.swift; sourceTree = ""; }; - 0145F6FC244DDEA70083AA37 /* ChargeCard.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChargeCard.pb.swift; sourceTree = ""; }; - 0145F6FD244DDEA70083AA37 /* SupportGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportGlobal.pb.swift; sourceTree = ""; }; - 0145F6FE244DDEA70083AA37 /* EventManager.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventManager.pb.swift; sourceTree = ""; }; - 0145F6FF244DDEA80083AA37 /* client.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = client.pb.swift; sourceTree = ""; }; - 0145F700244DDEA80083AA37 /* DynamicTable.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicTable.pb.swift; sourceTree = ""; }; + 01A89B26245052DA0034D2B7 /* EmailControllerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailControllerImpl.swift; sourceTree = ""; }; + 01A89B27245052DA0034D2B7 /* GameActionServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameActionServiceV2Impl.swift; sourceTree = ""; }; + 01A89B28245052DA0034D2B7 /* PazhServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PazhServiceV1Impl.swift; sourceTree = ""; }; + 01A89B29245052DA0034D2B7 /* PushControllerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushControllerImpl.swift; sourceTree = ""; }; + 01A89B2A245052DA0034D2B7 /* DynamicTableServiceTablesV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicTableServiceTablesV1Impl.swift; sourceTree = ""; }; + 01A89B2B245052DA0034D2B7 /* GamePointServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamePointServiceV2Impl.swift; sourceTree = ""; }; + 01A89B2C245052DA0034D2B7 /* ContentServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentServiceV1Impl.swift; sourceTree = ""; }; + 01A89B2D245052DA0034D2B7 /* PushFCMServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushFCMServiceV1Impl.swift; sourceTree = ""; }; + 01A89B2E245052DB0034D2B7 /* ReferralServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReferralServiceV1Impl.swift; sourceTree = ""; }; + 01A89B2F245052DB0034D2B7 /* SubscriberServiceV1_1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriberServiceV1_1Impl.swift; sourceTree = ""; }; + 01A89B30245052DB0034D2B7 /* SupportServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportServiceV1Impl.swift; sourceTree = ""; }; + 01A89B31245052DB0034D2B7 /* EventManagerServiceImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventManagerServiceImpl.swift; sourceTree = ""; }; + 01A89B32245052DB0034D2B7 /* UserDeviceControllerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDeviceControllerImpl.swift; sourceTree = ""; }; + 01A89B33245052DB0034D2B7 /* GatewayServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GatewayServiceV1Impl.swift; sourceTree = ""; }; + 01A89B34245052DC0034D2B7 /* GeoServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeoServiceV1Impl.swift; sourceTree = ""; }; + 01A89B35245052DC0034D2B7 /* GameLeaderBoardServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameLeaderBoardServiceV2Impl.swift; sourceTree = ""; }; + 01A89B36245052DC0034D2B7 /* GameUsersServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameUsersServiceV1Impl.swift; sourceTree = ""; }; + 01A89B37245052DC0034D2B7 /* HambaziServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HambaziServiceV1Impl.swift; sourceTree = ""; }; + 01A89B38245052DC0034D2B7 /* AppServicesImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppServicesImpl.swift; sourceTree = ""; }; + 01A89B39245052DC0034D2B7 /* KalingaServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KalingaServiceV1Impl.swift; sourceTree = ""; }; + 01A89B3A245052DD0034D2B7 /* GameFeaturesServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameFeaturesServiceV1Impl.swift; sourceTree = ""; }; + 01A89B3B245052DD0034D2B7 /* SubscriberServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriberServiceV2Impl.swift; sourceTree = ""; }; + 01A89B3C245052DD0034D2B7 /* GameActionServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameActionServiceV1Impl.swift; sourceTree = ""; }; + 01A89B3D245052DD0034D2B7 /* billingImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = billingImpl.swift; sourceTree = ""; }; + 01A89B3E245052DD0034D2B7 /* DynamicTableServiceEndpointsV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicTableServiceEndpointsV1Impl.swift; sourceTree = ""; }; + 01A89B3F245052DD0034D2B7 /* GamePointTypeServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamePointTypeServiceV1Impl.swift; sourceTree = ""; }; + 01A89B40245052DE0034D2B7 /* AvatarServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarServiceV1Impl.swift; sourceTree = ""; }; + 01A89B41245052DE0034D2B7 /* ChargeServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChargeServiceV1Impl.swift; sourceTree = ""; }; + 01A89B42245052DE0034D2B7 /* EventServiceImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventServiceImpl.swift; sourceTree = ""; }; + 01A89B43245052DE0034D2B7 /* AnalyticServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticServiceV1Impl.swift; sourceTree = ""; }; + 01A89B44245052DE0034D2B7 /* AvServiceImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvServiceImpl.swift; sourceTree = ""; }; + 01A89B45245052DE0034D2B7 /* ShopServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShopServiceV1Impl.swift; sourceTree = ""; }; + 01A89B46245052DE0034D2B7 /* AppVersionServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppVersionServiceV1Impl.swift; sourceTree = ""; }; + 01A89B47245052DE0034D2B7 /* SubscriberServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriberServiceV1Impl.swift; sourceTree = ""; }; + 01A89B48245052DE0034D2B7 /* GameLeaderBoardServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameLeaderBoardServiceV1Impl.swift; sourceTree = ""; }; + 01A89B49245052DF0034D2B7 /* GameUserServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameUserServiceV2Impl.swift; sourceTree = ""; }; + 01A89B4A245052DF0034D2B7 /* DynamicLinkServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicLinkServiceV1Impl.swift; sourceTree = ""; }; + 01A89B4B245052DF0034D2B7 /* MgsServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MgsServiceV1Impl.swift; sourceTree = ""; }; + 01A89B4C245052DF0034D2B7 /* FileManagerServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileManagerServiceV1Impl.swift; sourceTree = ""; }; + 01A89B4D245052DF0034D2B7 /* GameFeaturesServiceV2Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameFeaturesServiceV2Impl.swift; sourceTree = ""; }; + 01A89B4E245052DF0034D2B7 /* BillingInappServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BillingInappServiceV1Impl.swift; sourceTree = ""; }; + 01A89B4F245052E00034D2B7 /* OperatorsServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperatorsServiceV1Impl.swift; sourceTree = ""; }; + 01A89B50245052E00034D2B7 /* LeagueServiceV1Impl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeagueServiceV1Impl.swift; sourceTree = ""; }; + 01A89B7E245053280034D2B7 /* Pazh.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pazh.pb.swift; sourceTree = ""; }; + 01A89B7F245053280034D2B7 /* OperatorsGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperatorsGlobalV1.pb.swift; sourceTree = ""; }; + 01A89B80245053280034D2B7 /* GeoGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeoGlobalV1.pb.swift; sourceTree = ""; }; + 01A89B81245053280034D2B7 /* Shop.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Shop.pb.swift; sourceTree = ""; }; + 01A89B82245053280034D2B7 /* AnalyticGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticGlobal.pb.swift; sourceTree = ""; }; + 01A89B83245053280034D2B7 /* Billing.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Billing.pb.swift; sourceTree = ""; }; + 01A89B84245053280034D2B7 /* Mgs.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mgs.pb.swift; sourceTree = ""; }; + 01A89B85245053280034D2B7 /* SupportGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportGlobal.pb.swift; sourceTree = ""; }; + 01A89B86245053280034D2B7 /* DynamicLink.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicLink.pb.swift; sourceTree = ""; }; + 01A89B87245053280034D2B7 /* GameLeague.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameLeague.pb.swift; sourceTree = ""; }; + 01A89B88245053290034D2B7 /* AppVersion.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppVersion.pb.swift; sourceTree = ""; }; + 01A89B89245053290034D2B7 /* Hambazi.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Hambazi.pb.swift; sourceTree = ""; }; + 01A89B8A245053290034D2B7 /* Poll.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Poll.pb.swift; sourceTree = ""; }; + 01A89B8B245053290034D2B7 /* EventGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventGlobal.pb.swift; sourceTree = ""; }; + 01A89B8C245053290034D2B7 /* FileGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileGlobal.pb.swift; sourceTree = ""; }; + 01A89B8D245053290034D2B7 /* Subscriber.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscriber.pb.swift; sourceTree = ""; }; + 01A89B8E245053290034D2B7 /* TimerGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimerGlobal.pb.swift; sourceTree = ""; }; + 01A89B8F245053290034D2B7 /* client.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = client.pb.swift; sourceTree = ""; }; + 01A89B90245053290034D2B7 /* Av.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Av.pb.swift; sourceTree = ""; }; + 01A89B91245053290034D2B7 /* ContentGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentGlobalV1.pb.swift; sourceTree = ""; }; + 01A89B92245053290034D2B7 /* Packets.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Packets.pb.swift; sourceTree = ""; }; + 01A89B93245053290034D2B7 /* AppGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppGlobal.pb.swift; sourceTree = ""; }; + 01A89B942450532A0034D2B7 /* EngagementChanelGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EngagementChanelGlobal.pb.swift; sourceTree = ""; }; + 01A89B952450532A0034D2B7 /* DynamicTable.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicTable.pb.swift; sourceTree = ""; }; + 01A89B962450532A0034D2B7 /* CommentGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentGlobal.pb.swift; sourceTree = ""; }; + 01A89B972450532A0034D2B7 /* ChargeCard.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChargeCard.pb.swift; sourceTree = ""; }; + 01A89B982450532A0034D2B7 /* EventManager.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventManager.pb.swift; sourceTree = ""; }; + 01A89B992450532C0034D2B7 /* GateWay.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GateWay.pb.swift; sourceTree = ""; }; + 01A89B9A2450532C0034D2B7 /* Health.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Health.pb.swift; sourceTree = ""; }; + 01A89B9B2450532C0034D2B7 /* AvatarGlobalV1.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarGlobalV1.pb.swift; sourceTree = ""; }; + 01A89B9C2450532C0034D2B7 /* setting.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = setting.pb.swift; sourceTree = ""; }; + 01A89B9D2450532C0034D2B7 /* MobileConnect.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MobileConnect.pb.swift; sourceTree = ""; }; + 01A89B9E2450532D0034D2B7 /* BillingInappGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BillingInappGlobal.pb.swift; sourceTree = ""; }; + 01A89B9F2450532D0034D2B7 /* Game.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Game.pb.swift; sourceTree = ""; }; + 01A89BA02450532D0034D2B7 /* Global.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Global.pb.swift; sourceTree = ""; }; + 01A89BA12450532D0034D2B7 /* Notification.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Notification.pb.swift; sourceTree = ""; }; + 01A89BA22450532D0034D2B7 /* ReferralGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReferralGlobal.pb.swift; sourceTree = ""; }; + 01A89BA32450532D0034D2B7 /* PushFCMGlobal.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushFCMGlobal.pb.swift; sourceTree = ""; }; 029EA38B1BC7D4A5905A7BFF2F4A45C1 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = ""; }; 04F6545CC4802A5172CB9476EE27E188 /* Message+JSONAdditions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Message+JSONAdditions.swift"; path = "Sources/SwiftProtobuf/Message+JSONAdditions.swift"; sourceTree = ""; }; 077F9C6D6AF3072D18BC5B20AC84A7D0 /* ContentModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ContentModel.swift; sourceTree = ""; }; @@ -558,44 +558,44 @@ 1354C4CE342A62C84D326B4D2D13A8EA /* protocolModel */ = { isa = PBXGroup; children = ( - 0145F6EC244DDEA60083AA37 /* AnalyticGlobal.pb.swift */, - 0145F6E1244DDEA50083AA37 /* AppGlobal.pb.swift */, - 0145F6F4244DDEA70083AA37 /* AppVersion.pb.swift */, - 0145F6F5244DDEA70083AA37 /* Av.pb.swift */, - 0145F6F2244DDEA60083AA37 /* AvatarGlobalV1.pb.swift */, - 0145F6E5244DDEA50083AA37 /* Billing.pb.swift */, - 0145F6F3244DDEA60083AA37 /* BillingInappGlobal.pb.swift */, - 0145F6FC244DDEA70083AA37 /* ChargeCard.pb.swift */, - 0145F6FF244DDEA80083AA37 /* client.pb.swift */, - 0145F6DD244DDEA50083AA37 /* CommentGlobal.pb.swift */, - 0145F6E4244DDEA50083AA37 /* ContentGlobalV1.pb.swift */, - 0145F6F6244DDEA70083AA37 /* DynamicLink.pb.swift */, - 0145F700244DDEA80083AA37 /* DynamicTable.pb.swift */, - 0145F6F8244DDEA70083AA37 /* EngagementChanelGlobal.pb.swift */, - 0145F6E7244DDEA50083AA37 /* EventGlobal.pb.swift */, - 0145F6FE244DDEA70083AA37 /* EventManager.pb.swift */, - 0145F6EB244DDEA60083AA37 /* FileGlobal.pb.swift */, - 0145F6DB244DDEA50083AA37 /* Game.pb.swift */, - 0145F6F1244DDEA60083AA37 /* GameLeague.pb.swift */, - 0145F6DE244DDEA50083AA37 /* GateWay.pb.swift */, - 0145F6E2244DDEA50083AA37 /* GeoGlobalV1.pb.swift */, - 0145F6DF244DDEA50083AA37 /* Global.pb.swift */, - 0145F6FB244DDEA70083AA37 /* Hambazi.pb.swift */, - 0145F6DC244DDEA50083AA37 /* Health.pb.swift */, - 0145F6E3244DDEA50083AA37 /* Mgs.pb.swift */, - 0145F6E6244DDEA50083AA37 /* MobileConnect.pb.swift */, - 0145F6E0244DDEA50083AA37 /* Notification.pb.swift */, - 0145F6F9244DDEA70083AA37 /* OperatorsGlobalV1.pb.swift */, - 0145F6ED244DDEA60083AA37 /* Packets.pb.swift */, - 0145F6EE244DDEA60083AA37 /* Pazh.pb.swift */, - 0145F6E8244DDEA60083AA37 /* Poll.pb.swift */, - 0145F6FA244DDEA70083AA37 /* PushFCMGlobal.pb.swift */, - 0145F6E9244DDEA60083AA37 /* ReferralGlobal.pb.swift */, - 0145F6F7244DDEA70083AA37 /* setting.pb.swift */, - 0145F6EF244DDEA60083AA37 /* Shop.pb.swift */, - 0145F6EA244DDEA60083AA37 /* Subscriber.pb.swift */, - 0145F6FD244DDEA70083AA37 /* SupportGlobal.pb.swift */, - 0145F6F0244DDEA60083AA37 /* TimerGlobal.pb.swift */, + 01A89B82245053280034D2B7 /* AnalyticGlobal.pb.swift */, + 01A89B93245053290034D2B7 /* AppGlobal.pb.swift */, + 01A89B88245053290034D2B7 /* AppVersion.pb.swift */, + 01A89B90245053290034D2B7 /* Av.pb.swift */, + 01A89B9B2450532C0034D2B7 /* AvatarGlobalV1.pb.swift */, + 01A89B83245053280034D2B7 /* Billing.pb.swift */, + 01A89B9E2450532D0034D2B7 /* BillingInappGlobal.pb.swift */, + 01A89B972450532A0034D2B7 /* ChargeCard.pb.swift */, + 01A89B8F245053290034D2B7 /* client.pb.swift */, + 01A89B962450532A0034D2B7 /* CommentGlobal.pb.swift */, + 01A89B91245053290034D2B7 /* ContentGlobalV1.pb.swift */, + 01A89B86245053280034D2B7 /* DynamicLink.pb.swift */, + 01A89B952450532A0034D2B7 /* DynamicTable.pb.swift */, + 01A89B942450532A0034D2B7 /* EngagementChanelGlobal.pb.swift */, + 01A89B8B245053290034D2B7 /* EventGlobal.pb.swift */, + 01A89B982450532A0034D2B7 /* EventManager.pb.swift */, + 01A89B8C245053290034D2B7 /* FileGlobal.pb.swift */, + 01A89B9F2450532D0034D2B7 /* Game.pb.swift */, + 01A89B87245053280034D2B7 /* GameLeague.pb.swift */, + 01A89B992450532C0034D2B7 /* GateWay.pb.swift */, + 01A89B80245053280034D2B7 /* GeoGlobalV1.pb.swift */, + 01A89BA02450532D0034D2B7 /* Global.pb.swift */, + 01A89B89245053290034D2B7 /* Hambazi.pb.swift */, + 01A89B9A2450532C0034D2B7 /* Health.pb.swift */, + 01A89B84245053280034D2B7 /* Mgs.pb.swift */, + 01A89B9D2450532C0034D2B7 /* MobileConnect.pb.swift */, + 01A89BA12450532D0034D2B7 /* Notification.pb.swift */, + 01A89B7F245053280034D2B7 /* OperatorsGlobalV1.pb.swift */, + 01A89B92245053290034D2B7 /* Packets.pb.swift */, + 01A89B7E245053280034D2B7 /* Pazh.pb.swift */, + 01A89B8A245053290034D2B7 /* Poll.pb.swift */, + 01A89BA32450532D0034D2B7 /* PushFCMGlobal.pb.swift */, + 01A89BA22450532D0034D2B7 /* ReferralGlobal.pb.swift */, + 01A89B9C2450532C0034D2B7 /* setting.pb.swift */, + 01A89B81245053280034D2B7 /* Shop.pb.swift */, + 01A89B8D245053290034D2B7 /* Subscriber.pb.swift */, + 01A89B85245053280034D2B7 /* SupportGlobal.pb.swift */, + 01A89B8E245053290034D2B7 /* TimerGlobal.pb.swift */, ); name = protocolModel; path = vaslAppSdk/Classes/protocolModel; @@ -810,49 +810,49 @@ 8671AF331F6C10D22B57D8041D395BCA /* Module */ = { isa = PBXGroup; children = ( - 0145F689244DDE560083AA37 /* AnalyticServiceV1Impl.swift */, - 0145F69E244DDE590083AA37 /* AppServicesImpl.swift */, - 0145F692244DDE570083AA37 /* AppVersionServiceV1Impl.swift */, - 0145F69B244DDE590083AA37 /* AvatarServiceV1Impl.swift */, - 0145F6A6244DDE5B0083AA37 /* AvServiceImpl.swift */, - 0145F690244DDE570083AA37 /* billingImpl.swift */, - 0145F69D244DDE590083AA37 /* BillingInappServiceV1Impl.swift */, - 0145F6AB244DDE5B0083AA37 /* ChargeServiceV1Impl.swift */, - 0145F691244DDE570083AA37 /* ContentServiceV1Impl.swift */, - 0145F6A8244DDE5B0083AA37 /* DynamicLinkServiceV1Impl.swift */, - 0145F68C244DDE560083AA37 /* DynamicTableServiceEndpointsV1Impl.swift */, - 0145F68E244DDE570083AA37 /* DynamicTableServiceTablesV1Impl.swift */, - 0145F686244DDE560083AA37 /* EmailControllerImpl.swift */, - 0145F6AE244DDE5B0083AA37 /* EventManagerServiceImpl.swift */, - 0145F69A244DDE590083AA37 /* EventServiceImpl.swift */, - 0145F684244DDE560083AA37 /* FileManagerServiceV1Impl.swift */, - 0145F6A7244DDE5B0083AA37 /* GameActionServiceV1Impl.swift */, - 0145F683244DDE550083AA37 /* GameActionServiceV2Impl.swift */, - 0145F69C244DDE590083AA37 /* GameFeaturesServiceV1Impl.swift */, - 0145F6A5244DDE5A0083AA37 /* GameFeaturesServiceV2Impl.swift */, - 0145F694244DDE580083AA37 /* GameLeaderBoardServiceV1Impl.swift */, - 0145F6A2244DDE5A0083AA37 /* GameLeaderBoardServiceV2Impl.swift */, - 0145F69F244DDE590083AA37 /* GamePointServiceV2Impl.swift */, - 0145F6A0244DDE5A0083AA37 /* GamePointTypeServiceV1Impl.swift */, - 0145F68F244DDE570083AA37 /* GameUserServiceV2Impl.swift */, - 0145F68D244DDE570083AA37 /* GameUsersServiceV1Impl.swift */, - 0145F687244DDE560083AA37 /* GatewayServiceV1Impl.swift */, - 0145F6A1244DDE5A0083AA37 /* GeoServiceV1Impl.swift */, - 0145F6AA244DDE5B0083AA37 /* HambaziServiceV1Impl.swift */, - 0145F6A9244DDE5B0083AA37 /* KalingaServiceV1Impl.swift */, - 0145F697244DDE580083AA37 /* LeagueServiceV1Impl.swift */, - 0145F693244DDE570083AA37 /* MgsServiceV1Impl.swift */, - 0145F68A244DDE560083AA37 /* OperatorsServiceV1Impl.swift */, - 0145F6AC244DDE5B0083AA37 /* PazhServiceV1Impl.swift */, - 0145F688244DDE560083AA37 /* PushControllerImpl.swift */, - 0145F685244DDE560083AA37 /* PushFCMServiceV1Impl.swift */, - 0145F695244DDE580083AA37 /* ReferralServiceV1Impl.swift */, - 0145F6A3244DDE5A0083AA37 /* ShopServiceV1Impl.swift */, - 0145F6A4244DDE5A0083AA37 /* SubscriberServiceV1_1Impl.swift */, - 0145F696244DDE580083AA37 /* SubscriberServiceV1Impl.swift */, - 0145F68B244DDE560083AA37 /* SubscriberServiceV2Impl.swift */, - 0145F698244DDE580083AA37 /* SupportServiceV1Impl.swift */, - 0145F6AD244DDE5B0083AA37 /* UserDeviceControllerImpl.swift */, + 01A89B43245052DE0034D2B7 /* AnalyticServiceV1Impl.swift */, + 01A89B38245052DC0034D2B7 /* AppServicesImpl.swift */, + 01A89B46245052DE0034D2B7 /* AppVersionServiceV1Impl.swift */, + 01A89B40245052DE0034D2B7 /* AvatarServiceV1Impl.swift */, + 01A89B44245052DE0034D2B7 /* AvServiceImpl.swift */, + 01A89B3D245052DD0034D2B7 /* billingImpl.swift */, + 01A89B4E245052DF0034D2B7 /* BillingInappServiceV1Impl.swift */, + 01A89B41245052DE0034D2B7 /* ChargeServiceV1Impl.swift */, + 01A89B2C245052DA0034D2B7 /* ContentServiceV1Impl.swift */, + 01A89B4A245052DF0034D2B7 /* DynamicLinkServiceV1Impl.swift */, + 01A89B3E245052DD0034D2B7 /* DynamicTableServiceEndpointsV1Impl.swift */, + 01A89B2A245052DA0034D2B7 /* DynamicTableServiceTablesV1Impl.swift */, + 01A89B26245052DA0034D2B7 /* EmailControllerImpl.swift */, + 01A89B31245052DB0034D2B7 /* EventManagerServiceImpl.swift */, + 01A89B42245052DE0034D2B7 /* EventServiceImpl.swift */, + 01A89B4C245052DF0034D2B7 /* FileManagerServiceV1Impl.swift */, + 01A89B3C245052DD0034D2B7 /* GameActionServiceV1Impl.swift */, + 01A89B27245052DA0034D2B7 /* GameActionServiceV2Impl.swift */, + 01A89B3A245052DD0034D2B7 /* GameFeaturesServiceV1Impl.swift */, + 01A89B4D245052DF0034D2B7 /* GameFeaturesServiceV2Impl.swift */, + 01A89B48245052DE0034D2B7 /* GameLeaderBoardServiceV1Impl.swift */, + 01A89B35245052DC0034D2B7 /* GameLeaderBoardServiceV2Impl.swift */, + 01A89B2B245052DA0034D2B7 /* GamePointServiceV2Impl.swift */, + 01A89B3F245052DD0034D2B7 /* GamePointTypeServiceV1Impl.swift */, + 01A89B49245052DF0034D2B7 /* GameUserServiceV2Impl.swift */, + 01A89B36245052DC0034D2B7 /* GameUsersServiceV1Impl.swift */, + 01A89B33245052DB0034D2B7 /* GatewayServiceV1Impl.swift */, + 01A89B34245052DC0034D2B7 /* GeoServiceV1Impl.swift */, + 01A89B37245052DC0034D2B7 /* HambaziServiceV1Impl.swift */, + 01A89B39245052DC0034D2B7 /* KalingaServiceV1Impl.swift */, + 01A89B50245052E00034D2B7 /* LeagueServiceV1Impl.swift */, + 01A89B4B245052DF0034D2B7 /* MgsServiceV1Impl.swift */, + 01A89B4F245052E00034D2B7 /* OperatorsServiceV1Impl.swift */, + 01A89B28245052DA0034D2B7 /* PazhServiceV1Impl.swift */, + 01A89B29245052DA0034D2B7 /* PushControllerImpl.swift */, + 01A89B2D245052DA0034D2B7 /* PushFCMServiceV1Impl.swift */, + 01A89B2E245052DB0034D2B7 /* ReferralServiceV1Impl.swift */, + 01A89B45245052DE0034D2B7 /* ShopServiceV1Impl.swift */, + 01A89B2F245052DB0034D2B7 /* SubscriberServiceV1_1Impl.swift */, + 01A89B47245052DE0034D2B7 /* SubscriberServiceV1Impl.swift */, + 01A89B3B245052DD0034D2B7 /* SubscriberServiceV2Impl.swift */, + 01A89B30245052DB0034D2B7 /* SupportServiceV1Impl.swift */, + 01A89B32245052DB0034D2B7 /* UserDeviceControllerImpl.swift */, 23588BCCD327B39F966871880DE68448 /* Services.swift */, ); name = Module; @@ -1205,102 +1205,102 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0145F6B8244DDE5B0083AA37 /* DynamicTableServiceEndpointsV1Impl.swift in Sources */, + 01A89B69245052E00034D2B7 /* billingImpl.swift in Sources */, + 01A89BBA2450532D0034D2B7 /* EngagementChanelGlobal.pb.swift in Sources */, 9A9C93EAA13DD710C1F11F4D8113E08E /* ContentModel.swift in Sources */, - 0145F70C244DDEA80083AA37 /* MobileConnect.pb.swift in Sources */, - 0145F704244DDEA80083AA37 /* GateWay.pb.swift in Sources */, + 01A89BBE2450532D0034D2B7 /* EventManager.pb.swift in Sources */, + 01A89B63245052E00034D2B7 /* HambaziServiceV1Impl.swift in Sources */, + 01A89B5B245052E00034D2B7 /* SubscriberServiceV1_1Impl.swift in Sources */, + 01A89BBC2450532D0034D2B7 /* CommentGlobal.pb.swift in Sources */, 74D67B312C5251E89DCCE892934070C4 /* enumFile.swift in Sources */, - 0145F710244DDEA80083AA37 /* Subscriber.pb.swift in Sources */, - 0145F70B244DDEA80083AA37 /* Billing.pb.swift in Sources */, - 0145F721244DDEA80083AA37 /* Hambazi.pb.swift in Sources */, - 0145F6D4244DDE5C0083AA37 /* DynamicLinkServiceV1Impl.swift in Sources */, + 01A89BB32450532D0034D2B7 /* Subscriber.pb.swift in Sources */, + 01A89B67245052E00034D2B7 /* SubscriberServiceV2Impl.swift in Sources */, + 01A89BB52450532D0034D2B7 /* client.pb.swift in Sources */, + 01A89B64245052E00034D2B7 /* AppServicesImpl.swift in Sources */, 4ADD6A0BA9E074D98FF6700B80D49490 /* MimeType.swift in Sources */, - 0145F6C8244DDE5C0083AA37 /* GameFeaturesServiceV1Impl.swift in Sources */, - 0145F6B4244DDE5B0083AA37 /* PushControllerImpl.swift in Sources */, - 0145F70D244DDEA80083AA37 /* EventGlobal.pb.swift in Sources */, - 0145F6B0244DDE5B0083AA37 /* FileManagerServiceV1Impl.swift in Sources */, - 0145F6C0244DDE5C0083AA37 /* GameLeaderBoardServiceV1Impl.swift in Sources */, - 0145F714244DDEA80083AA37 /* Pazh.pb.swift in Sources */, - 0145F709244DDEA80083AA37 /* Mgs.pb.swift in Sources */, - 0145F6B6244DDE5B0083AA37 /* OperatorsServiceV1Impl.swift in Sources */, - 0145F713244DDEA80083AA37 /* Packets.pb.swift in Sources */, - 0145F6D6244DDE5C0083AA37 /* HambaziServiceV1Impl.swift in Sources */, - 0145F716244DDEA80083AA37 /* TimerGlobal.pb.swift in Sources */, - 0145F6C2244DDE5C0083AA37 /* SubscriberServiceV1Impl.swift in Sources */, + 01A89B5D245052E00034D2B7 /* EventManagerServiceImpl.swift in Sources */, + 01A89B66245052E00034D2B7 /* GameFeaturesServiceV1Impl.swift in Sources */, + 01A89BC22450532D0034D2B7 /* setting.pb.swift in Sources */, + 01A89B7C245052E00034D2B7 /* LeagueServiceV1Impl.swift in Sources */, + 01A89BB72450532D0034D2B7 /* ContentGlobalV1.pb.swift in Sources */, + 01A89BA42450532D0034D2B7 /* Pazh.pb.swift in Sources */, + 01A89B59245052E00034D2B7 /* PushFCMServiceV1Impl.swift in Sources */, + 01A89B68245052E00034D2B7 /* GameActionServiceV1Impl.swift in Sources */, + 01A89BBD2450532D0034D2B7 /* ChargeCard.pb.swift in Sources */, + 01A89BC82450532D0034D2B7 /* ReferralGlobal.pb.swift in Sources */, + 01A89B70245052E00034D2B7 /* AvServiceImpl.swift in Sources */, + 01A89BAA2450532D0034D2B7 /* Mgs.pb.swift in Sources */, + 01A89B6A245052E00034D2B7 /* DynamicTableServiceEndpointsV1Impl.swift in Sources */, + 01A89B61245052E00034D2B7 /* GameLeaderBoardServiceV2Impl.swift in Sources */, + 01A89B55245052E00034D2B7 /* PushControllerImpl.swift in Sources */, + 01A89B73245052E00034D2B7 /* SubscriberServiceV1Impl.swift in Sources */, + 01A89B7A245052E00034D2B7 /* BillingInappServiceV1Impl.swift in Sources */, + 01A89B6D245052E00034D2B7 /* ChargeServiceV1Impl.swift in Sources */, + 01A89BBB2450532D0034D2B7 /* DynamicTable.pb.swift in Sources */, + 01A89BB22450532D0034D2B7 /* FileGlobal.pb.swift in Sources */, 412EE7E8901D8070E7715F958FC444B6 /* NonceGenerator.swift in Sources */, - 0145F6BE244DDE5C0083AA37 /* AppVersionServiceV1Impl.swift in Sources */, - 0145F6B5244DDE5B0083AA37 /* AnalyticServiceV1Impl.swift in Sources */, - 0145F719244DDEA80083AA37 /* BillingInappGlobal.pb.swift in Sources */, + 01A89B77245052E00034D2B7 /* MgsServiceV1Impl.swift in Sources */, 905FD2D51A3FD749C1B4CE6A53DAEF11 /* PubicValue.swift in Sources */, - 0145F6C9244DDE5C0083AA37 /* BillingInappServiceV1Impl.swift in Sources */, - 0145F70E244DDEA80083AA37 /* Poll.pb.swift in Sources */, - 0145F708244DDEA80083AA37 /* GeoGlobalV1.pb.swift in Sources */, - 0145F722244DDEA80083AA37 /* ChargeCard.pb.swift in Sources */, - 0145F6C1244DDE5C0083AA37 /* ReferralServiceV1Impl.swift in Sources */, - 0145F726244DDEA80083AA37 /* DynamicTable.pb.swift in Sources */, - 0145F707244DDEA80083AA37 /* AppGlobal.pb.swift in Sources */, - 0145F6D8244DDE5C0083AA37 /* PazhServiceV1Impl.swift in Sources */, - 0145F6BF244DDE5C0083AA37 /* MgsServiceV1Impl.swift in Sources */, + 01A89BB12450532D0034D2B7 /* EventGlobal.pb.swift in Sources */, + 01A89B57245052E00034D2B7 /* GamePointServiceV2Impl.swift in Sources */, + 01A89B62245052E00034D2B7 /* GameUsersServiceV1Impl.swift in Sources */, 3D0B669A4D2BC5E8EFF5A03FE85E5704 /* RestService.swift in Sources */, - 0145F703244DDEA80083AA37 /* CommentGlobal.pb.swift in Sources */, - 0145F702244DDEA80083AA37 /* Health.pb.swift in Sources */, - 0145F6D2244DDE5C0083AA37 /* AvServiceImpl.swift in Sources */, - 0145F6D1244DDE5C0083AA37 /* GameFeaturesServiceV2Impl.swift in Sources */, + 01A89B75245052E00034D2B7 /* GameUserServiceV2Impl.swift in Sources */, + 01A89B78245052E00034D2B7 /* FileManagerServiceV1Impl.swift in Sources */, + 01A89BB02450532D0034D2B7 /* Poll.pb.swift in Sources */, + 01A89BA52450532D0034D2B7 /* OperatorsGlobalV1.pb.swift in Sources */, + 01A89B5C245052E00034D2B7 /* SupportServiceV1Impl.swift in Sources */, + 01A89B60245052E00034D2B7 /* GeoServiceV1Impl.swift in Sources */, 6E48ED5C203CCADDD73BFCA3484F8032 /* Services.swift in Sources */, - 0145F6D7244DDE5C0083AA37 /* ChargeServiceV1Impl.swift in Sources */, - 0145F6C4244DDE5C0083AA37 /* SupportServiceV1Impl.swift in Sources */, - 0145F6B1244DDE5B0083AA37 /* PushFCMServiceV1Impl.swift in Sources */, - 0145F6BB244DDE5C0083AA37 /* GameUserServiceV2Impl.swift in Sources */, - 0145F6D3244DDE5C0083AA37 /* GameActionServiceV1Impl.swift in Sources */, - 0145F6BA244DDE5C0083AA37 /* DynamicTableServiceTablesV1Impl.swift in Sources */, - 0145F70F244DDEA80083AA37 /* ReferralGlobal.pb.swift in Sources */, - 0145F701244DDEA80083AA37 /* Game.pb.swift in Sources */, - 0145F718244DDEA80083AA37 /* AvatarGlobalV1.pb.swift in Sources */, - 0145F70A244DDEA80083AA37 /* ContentGlobalV1.pb.swift in Sources */, - 0145F706244DDEA80083AA37 /* Notification.pb.swift in Sources */, - 0145F6CB244DDE5C0083AA37 /* GamePointServiceV2Impl.swift in Sources */, - 0145F6D5244DDE5C0083AA37 /* KalingaServiceV1Impl.swift in Sources */, - 0145F6CD244DDE5C0083AA37 /* GeoServiceV1Impl.swift in Sources */, - 0145F723244DDEA80083AA37 /* SupportGlobal.pb.swift in Sources */, + 01A89B5E245052E00034D2B7 /* UserDeviceControllerImpl.swift in Sources */, + 01A89B53245052E00034D2B7 /* GameActionServiceV2Impl.swift in Sources */, + 01A89BB92450532D0034D2B7 /* AppGlobal.pb.swift in Sources */, + 01A89BC92450532D0034D2B7 /* PushFCMGlobal.pb.swift in Sources */, + 01A89B72245052E00034D2B7 /* AppVersionServiceV1Impl.swift in Sources */, + 01A89B54245052E00034D2B7 /* PazhServiceV1Impl.swift in Sources */, 59A9A521798C23E719A5964B8D731644 /* String.swift in Sources */, - 0145F6B7244DDE5B0083AA37 /* SubscriberServiceV2Impl.swift in Sources */, - 0145F6D9244DDE5C0083AA37 /* UserDeviceControllerImpl.swift in Sources */, - 0145F6BC244DDE5C0083AA37 /* billingImpl.swift in Sources */, - 0145F6DA244DDE5C0083AA37 /* EventManagerServiceImpl.swift in Sources */, - 0145F6BD244DDE5C0083AA37 /* ContentServiceV1Impl.swift in Sources */, - 0145F71A244DDEA80083AA37 /* AppVersion.pb.swift in Sources */, - 0145F6C7244DDE5C0083AA37 /* AvatarServiceV1Impl.swift in Sources */, - 0145F71F244DDEA80083AA37 /* OperatorsGlobalV1.pb.swift in Sources */, - 0145F6AF244DDE5B0083AA37 /* GameActionServiceV2Impl.swift in Sources */, - 0145F720244DDEA80083AA37 /* PushFCMGlobal.pb.swift in Sources */, - 0145F6B9244DDE5B0083AA37 /* GameUsersServiceV1Impl.swift in Sources */, - 0145F712244DDEA80083AA37 /* AnalyticGlobal.pb.swift in Sources */, + 01A89BA92450532D0034D2B7 /* Billing.pb.swift in Sources */, + 01A89BAF2450532D0034D2B7 /* Hambazi.pb.swift in Sources */, + 01A89B6B245052E00034D2B7 /* GamePointTypeServiceV1Impl.swift in Sources */, + 01A89B6F245052E00034D2B7 /* AnalyticServiceV1Impl.swift in Sources */, + 01A89BC02450532D0034D2B7 /* Health.pb.swift in Sources */, A6E4FBCCCBCCFA5607871CFE6881809A /* TokenInfoModel.swift in Sources */, + 01A89BB42450532D0034D2B7 /* TimerGlobal.pb.swift in Sources */, + 01A89BC12450532D0034D2B7 /* AvatarGlobalV1.pb.swift in Sources */, + 01A89B56245052E00034D2B7 /* DynamicTableServiceTablesV1Impl.swift in Sources */, 4DB3D65F85596E3B13A58000BE2A2B51 /* Utils.swift in Sources */, + 01A89B7B245052E00034D2B7 /* OperatorsServiceV1Impl.swift in Sources */, + 01A89BC72450532D0034D2B7 /* Notification.pb.swift in Sources */, BFAD9DAC7B5EF7CCF01F8515AFDF5F28 /* UUID.swift in Sources */, - 0145F725244DDEA80083AA37 /* client.pb.swift in Sources */, - 0145F6B2244DDE5B0083AA37 /* EmailControllerImpl.swift in Sources */, - 0145F6CA244DDE5C0083AA37 /* AppServicesImpl.swift in Sources */, - 0145F715244DDEA80083AA37 /* Shop.pb.swift in Sources */, - 0145F711244DDEA80083AA37 /* FileGlobal.pb.swift in Sources */, - 0145F6CE244DDE5C0083AA37 /* GameLeaderBoardServiceV2Impl.swift in Sources */, - 0145F71D244DDEA80083AA37 /* setting.pb.swift in Sources */, - 0145F6C3244DDE5C0083AA37 /* LeagueServiceV1Impl.swift in Sources */, - 0145F6C6244DDE5C0083AA37 /* EventServiceImpl.swift in Sources */, - 0145F71E244DDEA80083AA37 /* EngagementChanelGlobal.pb.swift in Sources */, - 0145F71B244DDEA80083AA37 /* Av.pb.swift in Sources */, + 01A89BAD2450532D0034D2B7 /* GameLeague.pb.swift in Sources */, + 01A89BAB2450532D0034D2B7 /* SupportGlobal.pb.swift in Sources */, + 01A89B6E245052E00034D2B7 /* EventServiceImpl.swift in Sources */, + 01A89BAC2450532D0034D2B7 /* DynamicLink.pb.swift in Sources */, + 01A89B65245052E00034D2B7 /* KalingaServiceV1Impl.swift in Sources */, + 01A89BA62450532D0034D2B7 /* GeoGlobalV1.pb.swift in Sources */, + 01A89B52245052E00034D2B7 /* EmailControllerImpl.swift in Sources */, + 01A89BAE2450532D0034D2B7 /* AppVersion.pb.swift in Sources */, + 01A89B5A245052E00034D2B7 /* ReferralServiceV1Impl.swift in Sources */, + 01A89B71245052E00034D2B7 /* ShopServiceV1Impl.swift in Sources */, 79598C7DBC7861073564F7A0C1539E6E /* UUIDTimeBasedGenerator.swift in Sources */, - 0145F6CC244DDE5C0083AA37 /* GamePointTypeServiceV1Impl.swift in Sources */, + 01A89B76245052E00034D2B7 /* DynamicLinkServiceV1Impl.swift in Sources */, 6C78A3F8B98792E0B5123F63D75672F9 /* vaslAppSdk-dummy.m in Sources */, - 0145F717244DDEA80083AA37 /* GameLeague.pb.swift in Sources */, - 0145F6D0244DDE5C0083AA37 /* SubscriberServiceV1_1Impl.swift in Sources */, - 0145F71C244DDEA80083AA37 /* DynamicLink.pb.swift in Sources */, - 0145F724244DDEA80083AA37 /* EventManager.pb.swift in Sources */, - 0145F705244DDEA80083AA37 /* Global.pb.swift in Sources */, - 0145F6CF244DDE5C0083AA37 /* ShopServiceV1Impl.swift in Sources */, - 0145F6B3244DDE5B0083AA37 /* GatewayServiceV1Impl.swift in Sources */, + 01A89BC52450532D0034D2B7 /* Game.pb.swift in Sources */, + 01A89B5F245052E00034D2B7 /* GatewayServiceV1Impl.swift in Sources */, + 01A89BB82450532D0034D2B7 /* Packets.pb.swift in Sources */, + 01A89BA82450532D0034D2B7 /* AnalyticGlobal.pb.swift in Sources */, + 01A89B58245052E00034D2B7 /* ContentServiceV1Impl.swift in Sources */, + 01A89BC32450532D0034D2B7 /* MobileConnect.pb.swift in Sources */, + 01A89BB62450532D0034D2B7 /* Av.pb.swift in Sources */, + 01A89BC62450532D0034D2B7 /* Global.pb.swift in Sources */, + 01A89BBF2450532D0034D2B7 /* GateWay.pb.swift in Sources */, + 01A89BA72450532D0034D2B7 /* Shop.pb.swift in Sources */, + 01A89B6C245052E00034D2B7 /* AvatarServiceV1Impl.swift in Sources */, 2F64DF09CEFC4C930BC48F375D0B0817 /* VaslSdk.swift in Sources */, + 01A89BC42450532D0034D2B7 /* BillingInappGlobal.pb.swift in Sources */, + 01A89B74245052E00034D2B7 /* GameLeaderBoardServiceV1Impl.swift in Sources */, FB850DE57E252A89AECFA20D539651B9 /* webServiceResult.swift in Sources */, + 01A89B79245052E00034D2B7 /* GameFeaturesServiceV2Impl.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Example/vaslAppSdk.xcodeproj/project.pbxproj b/Example/vaslAppSdk.xcodeproj/project.pbxproj index 80f301a..0a36adc 100755 --- a/Example/vaslAppSdk.xcodeproj/project.pbxproj +++ b/Example/vaslAppSdk.xcodeproj/project.pbxproj @@ -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\"", @@ -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)"; @@ -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)", @@ -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)"; diff --git a/vaslAppSdk.podspec b/vaslAppSdk.podspec index 740b9d1..915ce34 100755 --- a/vaslAppSdk.podspec +++ b/vaslAppSdk.podspec @@ -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 ' diff --git a/vaslAppSdk/Classes/Module/AnalyticServiceV1Impl.swift b/vaslAppSdk/Classes/Module/AnalyticServiceV1Impl.swift index d5c92ae..d3e699f 100644 --- a/vaslAppSdk/Classes/Module/AnalyticServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/AnalyticServiceV1Impl.swift @@ -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, 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, deviceId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Analytic_Global_Proto_Holder_SetDeviceInfo?,String?) -> Void) @@ -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() - 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 { @@ -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) } @@ -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() + 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 { @@ -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) } diff --git a/vaslAppSdk/Classes/Module/AppServicesImpl.swift b/vaslAppSdk/Classes/Module/AppServicesImpl.swift index 223f94b..4e9bc15 100644 --- a/vaslAppSdk/Classes/Module/AppServicesImpl.swift +++ b/vaslAppSdk/Classes/Module/AppServicesImpl.swift @@ -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() + let params = Dictionary() let hasNounce = false diff --git a/vaslAppSdk/Classes/Module/AvServiceImpl.swift b/vaslAppSdk/Classes/Module/AvServiceImpl.swift index 088bee7..5c39f76 100644 --- a/vaslAppSdk/Classes/Module/AvServiceImpl.swift +++ b/vaslAppSdk/Classes/Module/AvServiceImpl.swift @@ -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) @@ -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() - 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) } @@ -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() - 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) } diff --git a/vaslAppSdk/Classes/Module/ContentServiceV1Impl.swift b/vaslAppSdk/Classes/Module/ContentServiceV1Impl.swift index 7543e08..af299d1 100644 --- a/vaslAppSdk/Classes/Module/ContentServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/ContentServiceV1Impl.swift @@ -4,14 +4,6 @@ protocol ContentServiceV1 { func getContent(contentId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Content_Global_Proto_Holder_ContentGet?,String?) -> Void) - func contentCommentAdd(refId: String, content: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd?,String?) -> Void) - - func contentCommentUpdate(commentId: String, content: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate?,String?) -> Void) - - func contentCommentRemove(commentId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove?,String?) -> Void) - - func contentCommentsList(refId: String, sort: String, order: String, page: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList?,String?) -> Void) - func listProperty(type: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Content_Global_Proto_Holder_ContentAdd?,String?) -> Void) func listCategory(page: String, keyWord: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Content_Global_Proto_Holder_CategoryList?,String?) -> Void) @@ -38,6 +30,14 @@ protocol ContentServiceV1 { func favContentList(sortType: String, page: String, order: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Content_Global_Proto_Holder_ContentsList?,String?) -> Void) + func contentCommentAdd(refId: String, content: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd?,String?) -> Void) + + func contentCommentUpdate(commentId: String, content: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate?,String?) -> Void) + + func contentCommentRemove(commentId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove?,String?) -> Void) + + func contentCommentsList(refId: String, sort: String, order: String, page: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList?,String?) -> Void) + } @@ -79,147 +79,6 @@ public class ContentServiceV1Impl : ContentServiceV1 { } - public func contentCommentAdd(refId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd?,String?) -> Void) { - contentCommentAdd(refId: refId, content: content, sessionId: sessionId, completion: completion,force: true) - } - - private func contentCommentAdd(refId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(refId , forKey: "refId") - params.updateValue(content , forKey: "content") - params.updateValue(sessionId , forKey: "sessionId") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/content/comment/add", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.contentCommentAdd(refId: refId, content: content, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - - public func contentCommentUpdate(commentId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate?,String?) -> Void) { - contentCommentUpdate(commentId: commentId, content: content, sessionId: sessionId, completion: completion,force: true) - } - - private func contentCommentUpdate(commentId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(commentId , forKey: "commentId") - params.updateValue(content , forKey: "content") - params.updateValue(sessionId , forKey: "sessionId") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/content/comment/update", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.contentCommentUpdate(commentId: commentId, content: content, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - - public func contentCommentRemove(commentId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove?,String?) -> Void) { - contentCommentRemove(commentId: commentId, sessionId: sessionId, completion: completion,force: true) - } - - private func contentCommentRemove(commentId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(commentId , forKey: "commentId") - params.updateValue(sessionId , forKey: "sessionId") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/content/comment/remove", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.contentCommentRemove(commentId: commentId, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - - public func contentCommentsList(refId: String, sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList?,String?) -> Void) { - contentCommentsList(refId: refId, sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: true) - } - - private func contentCommentsList(refId: String, sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(refId , forKey: "refId") - 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/content/comment/list", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.contentCommentsList(refId: refId, sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - public func listProperty(type: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Content_Global_Proto_Holder_ContentAdd?,String?) -> Void) { listProperty(type: type, sessionId: sessionId, completion: completion,force: true) } @@ -686,4 +545,145 @@ public class ContentServiceV1Impl : ContentServiceV1 { } + public func contentCommentAdd(refId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd?,String?) -> Void) { + contentCommentAdd(refId: refId, content: content, sessionId: sessionId, completion: completion,force: true) + } + + private func contentCommentAdd(refId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(refId , forKey: "refId") + params.updateValue(content , forKey: "content") + params.updateValue(sessionId , forKey: "sessionId") + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/content/comment/add", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentAdd + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.contentCommentAdd(refId: refId, content: content, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + + public func contentCommentUpdate(commentId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate?,String?) -> Void) { + contentCommentUpdate(commentId: commentId, content: content, sessionId: sessionId, completion: completion,force: true) + } + + private func contentCommentUpdate(commentId: String, content: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(commentId , forKey: "commentId") + params.updateValue(content , forKey: "content") + params.updateValue(sessionId , forKey: "sessionId") + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/content/comment/update", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentUpdate + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.contentCommentUpdate(commentId: commentId, content: content, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + + public func contentCommentRemove(commentId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove?,String?) -> Void) { + contentCommentRemove(commentId: commentId, sessionId: sessionId, completion: completion,force: true) + } + + private func contentCommentRemove(commentId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(commentId , forKey: "commentId") + params.updateValue(sessionId , forKey: "sessionId") + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/content/comment/remove", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentRemove + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.contentCommentRemove(commentId: commentId, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + + public func contentCommentsList(refId: String, sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList?,String?) -> Void) { + contentCommentsList(refId: refId, sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: true) + } + + private func contentCommentsList(refId: String, sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(refId , forKey: "refId") + 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/content/comment/list", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList(serializedData: result) as Com_Vasl_Vaslapp_Modules_Comment_Proto_Holder_CommentList + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.contentCommentsList(refId: refId, sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + } diff --git a/vaslAppSdk/Classes/Module/GameFeaturesServiceV1Impl.swift b/vaslAppSdk/Classes/Module/GameFeaturesServiceV1Impl.swift index a3bade5..dde0932 100644 --- a/vaslAppSdk/Classes/Module/GameFeaturesServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/GameFeaturesServiceV1Impl.swift @@ -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) { - var params = Dictionary() + let params = Dictionary() let hasNounce = false diff --git a/vaslAppSdk/Classes/Module/GameUsersServiceV1Impl.swift b/vaslAppSdk/Classes/Module/GameUsersServiceV1Impl.swift index 1a5c303..43de321 100644 --- a/vaslAppSdk/Classes/Module/GameUsersServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/GameUsersServiceV1Impl.swift @@ -16,7 +16,7 @@ public class GameUsersServiceV1Impl : GameUsersServiceV1 { } private func userStatus(completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_Global_Proto_Holder_UserStatus?,String?) -> Void,force : Bool) { - var params = Dictionary() + let params = Dictionary() let hasNounce = false diff --git a/vaslAppSdk/Classes/Module/GeoServiceV1Impl.swift b/vaslAppSdk/Classes/Module/GeoServiceV1Impl.swift index b29718e..e6acaa8 100644 --- a/vaslAppSdk/Classes/Module/GeoServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/GeoServiceV1Impl.swift @@ -2,8 +2,6 @@ import Foundation protocol GeoServiceV1 { - func nearLocation(latitude: String, longitude: String, page: String, findNearMaxDistanceInMeters: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation?,String?) -> Void) - func addLocation(title: String, refTitle: String, latitude: String, longitude: String, ip: String, tableName: String, fieldName: String, value: String, infoPoint: String, subscriberId: String, confirm: String, type: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_SetLocation?,String?) -> Void) func removeLocation(locationId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_RemoveLocation?,String?) -> Void) @@ -16,6 +14,8 @@ protocol GeoServiceV1 { func getAllCitys(country: String, state: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_GetInfoWorld?,String?) -> Void) + func nearLocation(latitude: String, longitude: String, page: String, findNearMaxDistanceInMeters: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation?,String?) -> Void) + } @@ -23,43 +23,6 @@ protocol GeoServiceV1 { public class GeoServiceV1Impl : GeoServiceV1 { - public func nearLocation(latitude: String, longitude: String, page: String, findNearMaxDistanceInMeters: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation?,String?) -> Void) { - nearLocation(latitude: latitude, longitude: longitude, page: page, findNearMaxDistanceInMeters: findNearMaxDistanceInMeters, sessionId: sessionId, completion: completion,force: true) - } - - private func nearLocation(latitude: String, longitude: String, page: String, findNearMaxDistanceInMeters: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(latitude , forKey: "latitude") - params.updateValue(longitude , forKey: "longitude") - params.updateValue(page , forKey: "page") - params.updateValue(findNearMaxDistanceInMeters , forKey: "findNearMaxDistanceInMeters") - params.updateValue(sessionId , forKey: "sessionId") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/geo/nearLocation", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation(serializedData: result) as Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.nearLocation(latitude: latitude, longitude: longitude, page: page, findNearMaxDistanceInMeters: findNearMaxDistanceInMeters, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - public func addLocation(title: String, refTitle: String, latitude: String, longitude: String, ip: String, tableName: String, fieldName: String, value: String, infoPoint: String, subscriberId: String, confirm: String, type: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_SetLocation?,String?) -> Void) { addLocation(title: title, refTitle: refTitle, latitude: latitude, longitude: longitude, ip: ip, tableName: tableName, fieldName: fieldName, value: value, infoPoint: infoPoint, subscriberId: subscriberId, confirm: confirm, type: type, sessionId: sessionId, completion: completion,force: true) } @@ -276,4 +239,41 @@ public class GeoServiceV1Impl : GeoServiceV1 { } + public func nearLocation(latitude: String, longitude: String, page: String, findNearMaxDistanceInMeters: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation?,String?) -> Void) { + nearLocation(latitude: latitude, longitude: longitude, page: page, findNearMaxDistanceInMeters: findNearMaxDistanceInMeters, sessionId: sessionId, completion: completion,force: true) + } + + private func nearLocation(latitude: String, longitude: String, page: String, findNearMaxDistanceInMeters: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(latitude , forKey: "latitude") + params.updateValue(longitude , forKey: "longitude") + params.updateValue(page , forKey: "page") + params.updateValue(findNearMaxDistanceInMeters , forKey: "findNearMaxDistanceInMeters") + params.updateValue(sessionId , forKey: "sessionId") + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/geo/nearLocation", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation(serializedData: result) as Com_Vasl_Vaslapp_Modules_Geo_Global_Proto_Holder_ListLocation + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.nearLocation(latitude: latitude, longitude: longitude, page: page, findNearMaxDistanceInMeters: findNearMaxDistanceInMeters, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + } diff --git a/vaslAppSdk/Classes/Module/KalingaServiceV1Impl.swift b/vaslAppSdk/Classes/Module/KalingaServiceV1Impl.swift index f2800ea..90481d5 100644 --- a/vaslAppSdk/Classes/Module/KalingaServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/KalingaServiceV1Impl.swift @@ -148,7 +148,7 @@ public class KalingaServiceV1Impl : KalingaServiceV1 { params.updateValue(lat , forKey: "lat") params.updateValue(lng , forKey: "lng") params.updateValue(propertyValue , forKey: "propertyValue") - // params.updateValue(language , forKey: "language") + // params.updateValue(language , forKey: "language") params.updateValue(type , forKey: "type") params.updateValue(sessionId , forKey: "sessionId") RestService.postJson(url: PublicValue.getUrlBase() + "/api/v1/Kalinga/content/add", params, completion: { (result, error) in @@ -239,7 +239,7 @@ public class KalingaServiceV1Impl : KalingaServiceV1 { params.updateValue(lat , forKey: "lat") params.updateValue(lng , forKey: "lng") params.updateValue(propertyValue , forKey: "propertyValue") - // params.updateValue(language , forKey: "language") + // params.updateValue(language , forKey: "language") params.updateValue(type , forKey: "type") params.updateValue(sessionId , forKey: "sessionId") RestService.postJson(url: PublicValue.getUrlBase() + "/api/v1/Kalinga/content/edit", params, completion: { (result, error) in diff --git a/vaslAppSdk/Classes/Module/LeagueServiceV1Impl.swift b/vaslAppSdk/Classes/Module/LeagueServiceV1Impl.swift index 880b2f0..ebd339a 100644 --- a/vaslAppSdk/Classes/Module/LeagueServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/LeagueServiceV1Impl.swift @@ -2,6 +2,8 @@ import Foundation protocol LeagueServiceV1 { + func leagueList(sort: String, order: String, page: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList?,String?) -> Void) + func leagueGet(leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueGet?,String?) -> Void) func leagueRewardList(leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_RewardList?,String?) -> Void) @@ -12,8 +14,6 @@ protocol LeagueServiceV1 { func leagueAnswer(leagueId: String, questionId: String, answer: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_CorrectAnswer?,String?) -> Void) - func leagueList(sort: String, order: String, page: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList?,String?) -> Void) - } @@ -21,6 +21,42 @@ protocol LeagueServiceV1 { public class LeagueServiceV1Impl : LeagueServiceV1 { + public func leagueList(sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList?,String?) -> Void) { + leagueList(sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: true) + } + + private func leagueList(sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList?,String?) -> Void,force : Bool) { + var params = Dictionary() + 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/leagues/list", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList(serializedData: result) as Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.leagueList(sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + public func leagueGet(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueGet?,String?) -> Void) { leagueGet(leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) } @@ -193,40 +229,4 @@ public class LeagueServiceV1Impl : LeagueServiceV1 { } - public func leagueList(sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList?,String?) -> Void) { - leagueList(sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: true) - } - - private func leagueList(sort: String, order: String, page: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList?,String?) -> Void,force : Bool) { - var params = Dictionary() - 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/leagues/list", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList(serializedData: result) as Com_Vasl_Vaslapp_Modules_Game_League_Global_Proto_Holder_LeagueList - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.leagueList(sort: sort, order: order, page: page, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - } diff --git a/vaslAppSdk/Classes/Module/PazhServiceV1Impl.swift b/vaslAppSdk/Classes/Module/PazhServiceV1Impl.swift index 0f4ffd5..8872581 100644 --- a/vaslAppSdk/Classes/Module/PazhServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/PazhServiceV1Impl.swift @@ -2,13 +2,13 @@ import Foundation protocol PazhServiceV1 { - func leagueGet(id: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet?,String?) -> Void) + func subscriberList(sessionId: String, sort: String, order: String, page: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList?,String?) -> Void) - func leagueRewardList(id: String, leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList?,String?) -> Void) + func subscriberMyProfile(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) - func leagueRegister(leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) + func subscriberUserProfile(sessionId: String, subscriberId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) - func leagueQuestionNext(leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet?,String?) -> Void) + func subscriberUpdate(sessionId: String, nickName: String, firstName: String, lastName: String, image: NSData, gender: String, birthDate: String, email: String,completion : @escaping (webServiceResult?,String?) -> Void) func helloWorld(title: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_HelloWorld?,String?) -> Void) @@ -44,15 +44,15 @@ protocol PazhServiceV1 { func chargeCheckTransaction(transactionId: String, authority: String, status: String, amount: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_ChargeBuy?,String?) -> Void) - func subscriberList(sessionId: String, sort: String, order: String, page: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList?,String?) -> Void) + func leagueList(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) - func subscriberMyProfile(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) + func leagueGet(id: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet?,String?) -> Void) - func subscriberUserProfile(sessionId: String, subscriberId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) + func leagueRewardList(id: String, leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList?,String?) -> Void) - func subscriberUpdate(sessionId: String, nickName: String, firstName: String, lastName: String, image: NSData, gender: String, birthDate: String, email: String,completion : @escaping (webServiceResult?,String?) -> Void) + func leagueRegister(leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) - func leagueList(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) + func leagueQuestionNext(leagueId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet?,String?) -> Void) } @@ -61,28 +61,30 @@ protocol PazhServiceV1 { public class PazhServiceV1Impl : PazhServiceV1 { - public func leagueGet(id: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet?,String?) -> Void) { - leagueGet(id: id, sessionId: sessionId, completion: completion,force: true) + public func subscriberList(sessionId: String, sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList?,String?) -> Void) { + subscriberList(sessionId: sessionId, sort: sort, order: order, page: page, completion: completion,force: true) } - private func leagueGet(id: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet?,String?) -> Void,force : Bool) { + private func subscriberList(sessionId: String, sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(id , forKey: "id") params.updateValue(sessionId , forKey: "sessionId") + 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/pazh/league/get", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/list", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.leagueGet(id: id, sessionId: sessionId, completion: completion,force: false) + self.subscriberList(sessionId: sessionId, sort: sort, order: order, page: page, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -95,29 +97,27 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func leagueRewardList(id: String, leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList?,String?) -> Void) { - leagueRewardList(id: id, leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) + public func subscriberMyProfile(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) { + subscriberMyProfile(sessionId: sessionId, completion: completion,force: true) } - private func leagueRewardList(id: String, leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList?,String?) -> Void,force : Bool) { + private func subscriberMyProfile(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(id , forKey: "id") - params.updateValue(leagueId , forKey: "leagueId") params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/reward/list", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/myprofile", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.leagueRewardList(id: id, leagueId: leagueId, sessionId: sessionId, completion: completion,force: false) + self.subscriberMyProfile(sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -130,28 +130,28 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func leagueRegister(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) { - leagueRegister(leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) + public func subscriberUserProfile(sessionId: String, subscriberId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) { + subscriberUserProfile(sessionId: sessionId, subscriberId: subscriberId, completion: completion,force: true) } - private func leagueRegister(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void,force : Bool) { + private func subscriberUserProfile(sessionId: String, subscriberId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(leagueId , forKey: "leagueId") params.updateValue(sessionId , forKey: "sessionId") + params.updateValue(subscriberId , forKey: "subscriberId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/register", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/userprofile", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.leagueRegister(leagueId: leagueId, sessionId: sessionId, completion: completion,force: false) + self.subscriberUserProfile(sessionId: sessionId, subscriberId: subscriberId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -164,37 +164,42 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func leagueQuestionNext(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet?,String?) -> Void) { - leagueQuestionNext(leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) + public func subscriberUpdate(sessionId: String, nickName: String, firstName: String, lastName: String, image: NSData, gender: String, birthDate: String, email: String,completion: @escaping (webServiceResult?,String?) -> Void) { + subscriberUpdate(sessionId: sessionId, nickName: nickName, firstName: firstName, lastName: lastName, image: image, gender: gender, birthDate: birthDate, email: email, completion: completion,force: true) } - private func leagueQuestionNext(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet?,String?) -> Void,force : Bool) { + private func subscriberUpdate(sessionId: String, nickName: String, firstName: String, lastName: String, image: NSData, gender: String, birthDate: String, email: String,completion: @escaping (webServiceResult?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(leagueId , forKey: "leagueId") params.updateValue(sessionId , forKey: "sessionId") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/question/next", params, completion: { (result, error) in + params.updateValue(nickName , forKey: "nickName") + params.updateValue(firstName , forKey: "firstName") + params.updateValue(lastName , forKey: "lastName") + params.updateValue(image , forKey: "image") + params.updateValue(gender , forKey: "gender") + params.updateValue(birthDate , forKey: "birthDate") + params.updateValue(email , forKey: "email") + RestService.postMultiPart(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/update", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet + let dictionary = try JSONSerialization.jsonObject(with: result, options: .mutableContainers) as! NSDictionary + let serviceResponse = webServiceResult.init() + serviceResponse.parseJsonResult(dictionary) if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.leagueQuestionNext(leagueId: leagueId, sessionId: sessionId, completion: completion,force: false) + self.subscriberUpdate(sessionId: sessionId, nickName: nickName, firstName: firstName, lastName: lastName, image: image, gender: gender, birthDate: birthDate, email: email, completion: completion,force: false) }else{ - completion(serviceResponse,serviceResponse.msg) + completion(serviceResponse,serviceResponse.message) } } } }catch{ completion(nil,"") } - }, force,hasNounce) + }, force) } @@ -811,30 +816,27 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func subscriberList(sessionId: String, sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList?,String?) -> Void) { - subscriberList(sessionId: sessionId, sort: sort, order: order, page: page, completion: completion,force: true) + public func leagueList(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) { + leagueList(sessionId: sessionId, completion: completion,force: true) } - private func subscriberList(sessionId: String, sort: String, order: String, page: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList?,String?) -> Void,force : Bool) { + private func leagueList(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void,force : Bool) { var params = Dictionary() params.updateValue(sessionId , forKey: "sessionId") - 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/pazh/subscriber/list", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/list", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberList + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.subscriberList(sessionId: sessionId, sort: sort, order: order, page: page, completion: completion,force: false) + self.leagueList(sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -847,27 +849,28 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func subscriberMyProfile(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) { - subscriberMyProfile(sessionId: sessionId, completion: completion,force: true) + public func leagueGet(id: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet?,String?) -> Void) { + leagueGet(id: id, sessionId: sessionId, completion: completion,force: true) } - private func subscriberMyProfile(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void,force : Bool) { + private func leagueGet(id: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(id , forKey: "id") params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/myprofile", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/get", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueGet if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.subscriberMyProfile(sessionId: sessionId, completion: completion,force: false) + self.leagueGet(id: id, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -880,28 +883,29 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func subscriberUserProfile(sessionId: String, subscriberId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void) { - subscriberUserProfile(sessionId: sessionId, subscriberId: subscriberId, completion: completion,force: true) + public func leagueRewardList(id: String, leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList?,String?) -> Void) { + leagueRewardList(id: id, leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) } - private func subscriberUserProfile(sessionId: String, subscriberId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet?,String?) -> Void,force : Bool) { + private func leagueRewardList(id: String, leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(id , forKey: "id") + params.updateValue(leagueId , forKey: "leagueId") params.updateValue(sessionId , forKey: "sessionId") - params.updateValue(subscriberId , forKey: "subscriberId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/userprofile", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/reward/list", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_SubscriberGet + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_RewardList if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.subscriberUserProfile(sessionId: sessionId, subscriberId: subscriberId, completion: completion,force: false) + self.leagueRewardList(id: id, leagueId: leagueId, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -914,66 +918,62 @@ public class PazhServiceV1Impl : PazhServiceV1 { } - public func subscriberUpdate(sessionId: String, nickName: String, firstName: String, lastName: String, image: NSData, gender: String, birthDate: String, email: String,completion: @escaping (webServiceResult?,String?) -> Void) { - subscriberUpdate(sessionId: sessionId, nickName: nickName, firstName: firstName, lastName: lastName, image: image, gender: gender, birthDate: birthDate, email: email, completion: completion,force: true) + public func leagueRegister(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) { + leagueRegister(leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) } - private func subscriberUpdate(sessionId: String, nickName: String, firstName: String, lastName: String, image: NSData, gender: String, birthDate: String, email: String,completion: @escaping (webServiceResult?,String?) -> Void,force : Bool) { + private func leagueRegister(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(leagueId , forKey: "leagueId") params.updateValue(sessionId , forKey: "sessionId") - params.updateValue(nickName , forKey: "nickName") - params.updateValue(firstName , forKey: "firstName") - params.updateValue(lastName , forKey: "lastName") - params.updateValue(image , forKey: "image") - params.updateValue(gender , forKey: "gender") - params.updateValue(birthDate , forKey: "birthDate") - params.updateValue(email , forKey: "email") - RestService.postMultiPart(url: PublicValue.getUrlBase() + "/api/v1/pazh/subscriber/update", params, completion: { (result, error) in + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/register", params, completion: { (result, error) in do{ if let result = result { - let dictionary = try JSONSerialization.jsonObject(with: result, options: .mutableContainers) as! NSDictionary - let serviceResponse = webServiceResult.init() - serviceResponse.parseJsonResult(dictionary) + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.subscriberUpdate(sessionId: sessionId, nickName: nickName, firstName: firstName, lastName: lastName, image: image, gender: gender, birthDate: birthDate, email: email, completion: completion,force: false) + self.leagueRegister(leagueId: leagueId, sessionId: sessionId, completion: completion,force: false) }else{ - completion(serviceResponse,serviceResponse.message) + completion(serviceResponse,serviceResponse.msg) } } } }catch{ completion(nil,"") } - }, force) + }, force,hasNounce) } - public func leagueList(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void) { - leagueList(sessionId: sessionId, completion: completion,force: true) + public func leagueQuestionNext(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet?,String?) -> Void) { + leagueQuestionNext(leagueId: leagueId, sessionId: sessionId, completion: completion,force: true) } - private func leagueList(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList?,String?) -> Void,force : Bool) { + private func leagueQuestionNext(leagueId: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(leagueId , forKey: "leagueId") params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/list", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/pazh/league/question/next", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_LeagueList + let serviceResponse = try Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet(serializedData: result) as Com_Vasl_Vaslapp_Products_Pazh_Proto_Holder_QuestionGet if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.leagueList(sessionId: sessionId, completion: completion,force: false) + self.leagueQuestionNext(leagueId: leagueId, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } diff --git a/vaslAppSdk/Classes/Module/PushFCMServiceV1Impl.swift b/vaslAppSdk/Classes/Module/PushFCMServiceV1Impl.swift index 645b05b..38438a4 100644 --- a/vaslAppSdk/Classes/Module/PushFCMServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/PushFCMServiceV1Impl.swift @@ -2,12 +2,12 @@ import Foundation protocol PushFCMServiceV1 { + func setToken(deviceId: String, token: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) + func addTopics(documentId: String, deviceId: String, msg_status: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage?,String?) -> Void) func addTopics(deviceId: String, topicsAdd: Array, topicsRemove: Array, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) - func setToken(deviceId: String, token: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) - } @@ -15,30 +15,28 @@ protocol PushFCMServiceV1 { public class PushFCMServiceV1Impl : PushFCMServiceV1 { - public func addTopics(documentId: String, deviceId: String, msg_status: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage?,String?) -> Void) { - addTopics(documentId: documentId, deviceId: deviceId, msg_status: msg_status, sessionId: sessionId, completion: completion,force: true) + public func setToken(deviceId: String, token: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) { + setToken(deviceId: deviceId, token: token, completion: completion,force: true) } - private func addTopics(documentId: String, deviceId: String, msg_status: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage?,String?) -> Void,force : Bool) { + private func setToken(deviceId: String, token: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(documentId , forKey: "documentId") params.updateValue(deviceId , forKey: "deviceId") - params.updateValue(msg_status , forKey: "msg_status") - params.updateValue(sessionId , forKey: "sessionId") + params.updateValue(token , forKey: "token") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/fcm/update/status", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/fcm/token/set", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage(serializedData: result) as Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken(serializedData: result) as Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.addTopics(documentId: documentId, deviceId: deviceId, msg_status: msg_status, sessionId: sessionId, completion: completion,force: false) + self.setToken(deviceId: deviceId, token: token, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -51,30 +49,30 @@ public class PushFCMServiceV1Impl : PushFCMServiceV1 { } - public func addTopics(deviceId: String, topicsAdd: Array, topicsRemove: Array, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) { - addTopics(deviceId: deviceId, topicsAdd: topicsAdd, topicsRemove: topicsRemove, sessionId: sessionId, completion: completion,force: true) + public func addTopics(documentId: String, deviceId: String, msg_status: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage?,String?) -> Void) { + addTopics(documentId: documentId, deviceId: deviceId, msg_status: msg_status, sessionId: sessionId, completion: completion,force: true) } - private func addTopics(deviceId: String, topicsAdd: Array, topicsRemove: Array, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void,force : Bool) { + private func addTopics(documentId: String, deviceId: String, msg_status: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(documentId , forKey: "documentId") params.updateValue(deviceId , forKey: "deviceId") - params.updateValue(topicsAdd , forKey: "topicsAdd") - params.updateValue(topicsRemove , forKey: "topicsRemove") + params.updateValue(msg_status , forKey: "msg_status") params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/fcm/topics", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/fcm/update/status", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken(serializedData: result) as Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage(serializedData: result) as Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SendMessage if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.addTopics(deviceId: deviceId, topicsAdd: topicsAdd, topicsRemove: topicsRemove, sessionId: sessionId, completion: completion,force: false) + self.addTopics(documentId: documentId, deviceId: deviceId, msg_status: msg_status, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -87,18 +85,20 @@ public class PushFCMServiceV1Impl : PushFCMServiceV1 { } - public func setToken(deviceId: String, token: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) { - setToken(deviceId: deviceId, token: token, completion: completion,force: true) + public func addTopics(deviceId: String, topicsAdd: Array, topicsRemove: Array, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void) { + addTopics(deviceId: deviceId, topicsAdd: topicsAdd, topicsRemove: topicsRemove, sessionId: sessionId, completion: completion,force: true) } - private func setToken(deviceId: String, token: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void,force : Bool) { + private func addTopics(deviceId: String, topicsAdd: Array, topicsRemove: Array, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Push_Fcm_Global_Proto_Holder_SetToken?,String?) -> Void,force : Bool) { var params = Dictionary() params.updateValue(deviceId , forKey: "deviceId") - params.updateValue(token , forKey: "token") + params.updateValue(topicsAdd , forKey: "topicsAdd") + params.updateValue(topicsRemove , forKey: "topicsRemove") + params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/fcm/token/set", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/fcm/topics", params, completion: { (result, error) in do{ if let result = result { @@ -108,7 +108,7 @@ public class PushFCMServiceV1Impl : PushFCMServiceV1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.setToken(deviceId: deviceId, token: token, completion: completion,force: false) + self.addTopics(deviceId: deviceId, topicsAdd: topicsAdd, topicsRemove: topicsRemove, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } diff --git a/vaslAppSdk/Classes/Module/ShopServiceV1Impl.swift b/vaslAppSdk/Classes/Module/ShopServiceV1Impl.swift index 968b220..7223c2d 100644 --- a/vaslAppSdk/Classes/Module/ShopServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/ShopServiceV1Impl.swift @@ -2,10 +2,10 @@ import Foundation protocol ShopServiceV1 { - func addAddress(nickName: String, mobile: String, phone: String, city: String, sector: String, address: String, postalCode: String, recipientName: String, recipientPhone: String, locationLatitude: String, locationLongitude: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) - func addComment(productId: String, comment: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) + func addScore(productId: String, score: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities?,String?) -> Void) + func listComment(productId: String, sort: String, order: String, page: String, limit: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_CommentListApi?,String?) -> Void) func addQuestion(productId: String, question: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) @@ -30,8 +30,6 @@ protocol ShopServiceV1 { func listOrder(insertTime: String, orderStatus: String, payStatus: String, sort: String, order: String, page: String, limit: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListOrders?,String?) -> Void) - func addScore(productId: String, score: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities?,String?) -> Void) - func listUnits(type: String, list: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListUnits?,String?) -> Void) func useCoupon(price: String, code: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_GetDiscountPrice?,String?) -> Void) @@ -40,6 +38,8 @@ protocol ShopServiceV1 { func getProduct(productId: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ProductGetApi?,String?) -> Void) + func addAddress(nickName: String, mobile: String, phone: String, city: String, sector: String, address: String, postalCode: String, recipientName: String, recipientPhone: String, locationLatitude: String, locationLongitude: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) + } @@ -47,28 +47,19 @@ protocol ShopServiceV1 { public class ShopServiceV1Impl : ShopServiceV1 { - public func addAddress(nickName: String, mobile: String, phone: String, city: String, sector: String, address: String, postalCode: String, recipientName: String, recipientPhone: String, locationLatitude: String, locationLongitude: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) { - addAddress(nickName: nickName, mobile: mobile, phone: phone, city: city, sector: sector, address: address, postalCode: postalCode, recipientName: recipientName, recipientPhone: recipientPhone, locationLatitude: locationLatitude, locationLongitude: locationLongitude, sessionId: sessionId, completion: completion,force: true) + public func addComment(productId: String, comment: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) { + addComment(productId: productId, comment: comment, sessionId: sessionId, completion: completion,force: true) } - private func addAddress(nickName: String, mobile: String, phone: String, city: String, sector: String, address: String, postalCode: String, recipientName: String, recipientPhone: String, locationLatitude: String, locationLongitude: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void,force : Bool) { + private func addComment(productId: String, comment: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(nickName , forKey: "nickName") - params.updateValue(mobile , forKey: "mobile") - params.updateValue(phone , forKey: "phone") - params.updateValue(city , forKey: "city") - params.updateValue(sector , forKey: "sector") - params.updateValue(address , forKey: "address") - params.updateValue(postalCode , forKey: "postalCode") - params.updateValue(recipientName , forKey: "recipientName") - params.updateValue(recipientPhone , forKey: "recipientPhone") - params.updateValue(locationLatitude , forKey: "locationLatitude") - params.updateValue(locationLongitude , forKey: "locationLongitude") + params.updateValue(productId , forKey: "productId") + params.updateValue(comment , forKey: "comment") params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/shop/add/address", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/shop/add/comment", params, completion: { (result, error) in do{ if let result = result { @@ -78,7 +69,7 @@ public class ShopServiceV1Impl : ShopServiceV1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.addAddress(nickName: nickName, mobile: mobile, phone: phone, city: city, sector: sector, address: address, postalCode: postalCode, recipientName: recipientName, recipientPhone: recipientPhone, locationLatitude: locationLatitude, locationLongitude: locationLongitude, sessionId: sessionId, completion: completion,force: false) + self.addComment(productId: productId, comment: comment, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -91,29 +82,29 @@ public class ShopServiceV1Impl : ShopServiceV1 { } - public func addComment(productId: String, comment: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) { - addComment(productId: productId, comment: comment, sessionId: sessionId, completion: completion,force: true) + public func addScore(productId: String, score: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities?,String?) -> Void) { + addScore(productId: productId, score: score, sessionId: sessionId, completion: completion,force: true) } - private func addComment(productId: String, comment: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void,force : Bool) { + private func addScore(productId: String, score: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities?,String?) -> Void,force : Bool) { var params = Dictionary() params.updateValue(productId , forKey: "productId") - params.updateValue(comment , forKey: "comment") + params.updateValue(score , forKey: "score") params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/shop/add/comment", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/shop/add/score", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct(serializedData: result) as Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities(serializedData: result) as Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.addComment(productId: productId, comment: comment, sessionId: sessionId, completion: completion,force: false) + self.addScore(productId: productId, score: score, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -568,41 +559,6 @@ public class ShopServiceV1Impl : ShopServiceV1 { } - public func addScore(productId: String, score: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities?,String?) -> Void) { - addScore(productId: productId, score: score, sessionId: sessionId, completion: completion,force: true) - } - - private func addScore(productId: String, score: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(productId , forKey: "productId") - params.updateValue(score , forKey: "score") - params.updateValue(sessionId , forKey: "sessionId") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/shop/add/score", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities(serializedData: result) as Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListCities - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.addScore(productId: productId, score: score, sessionId: sessionId, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - public func listUnits(type: String, list: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_ListUnits?,String?) -> Void) { listUnits(type: type, list: list, sessionId: sessionId, completion: completion,force: true) } @@ -742,4 +698,48 @@ public class ShopServiceV1Impl : ShopServiceV1 { } + public func addAddress(nickName: String, mobile: String, phone: String, city: String, sector: String, address: String, postalCode: String, recipientName: String, recipientPhone: String, locationLatitude: String, locationLongitude: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void) { + addAddress(nickName: nickName, mobile: mobile, phone: phone, city: city, sector: sector, address: address, postalCode: postalCode, recipientName: recipientName, recipientPhone: recipientPhone, locationLatitude: locationLatitude, locationLongitude: locationLongitude, sessionId: sessionId, completion: completion,force: true) + } + + private func addAddress(nickName: String, mobile: String, phone: String, city: String, sector: String, address: String, postalCode: String, recipientName: String, recipientPhone: String, locationLatitude: String, locationLongitude: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(nickName , forKey: "nickName") + params.updateValue(mobile , forKey: "mobile") + params.updateValue(phone , forKey: "phone") + params.updateValue(city , forKey: "city") + params.updateValue(sector , forKey: "sector") + params.updateValue(address , forKey: "address") + params.updateValue(postalCode , forKey: "postalCode") + params.updateValue(recipientName , forKey: "recipientName") + params.updateValue(recipientPhone , forKey: "recipientPhone") + params.updateValue(locationLatitude , forKey: "locationLatitude") + params.updateValue(locationLongitude , forKey: "locationLongitude") + params.updateValue(sessionId , forKey: "sessionId") + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/shop/add/address", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct(serializedData: result) as Com_Vasl_Vaslapp_Modules_Shop_Global_Proto_Holder_AddProduct + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.addAddress(nickName: nickName, mobile: mobile, phone: phone, city: city, sector: sector, address: address, postalCode: postalCode, recipientName: recipientName, recipientPhone: recipientPhone, locationLatitude: locationLatitude, locationLongitude: locationLongitude, sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + } diff --git a/vaslAppSdk/Classes/Module/SubscriberServiceV1Impl.swift b/vaslAppSdk/Classes/Module/SubscriberServiceV1Impl.swift index c1c71b4..702c6e6 100644 --- a/vaslAppSdk/Classes/Module/SubscriberServiceV1Impl.swift +++ b/vaslAppSdk/Classes/Module/SubscriberServiceV1Impl.swift @@ -4,18 +4,16 @@ protocol SubscriberServiceV1 { func register(username: String, password: String, email: String, mobile: String, registrationType: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) - func removeProfilePic(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void) - - func registerWithoutSubscriberType(username: String, password: String, email: String, mobile: String, registrationType: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) + func activate(username: String, activationKey: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) func registerWithNationalId(mobile: String, national_id: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) + func registerWithoutSubscriberType(username: String, password: String, email: String, mobile: String, registrationType: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) + func checkShahkarSubscriber(requestId: String, serviceNumber: String, serviceType: String, identificationType: String, identificationNo: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckShahkarSubscriber?,String?) -> Void) func activateAndLoginForNationalId(mobile: String, activationKey: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) - func activate(username: String, activationKey: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) - func saveProfileInfo(nickName: String, firstName: String, lastName: String, fatherName: String, shenasnamehNo: String, deathStatus: String, picture: NSData, gender: String, birthDate: String, nationalId: String, data: Array>, sessionId: String,completion : @escaping (webServiceResult?,String?) -> Void) func getProfileInfo(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void) @@ -64,6 +62,8 @@ protocol SubscriberServiceV1 { func validateOperatorSubscriber(activationKey: String, mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void) + func removeProfilePic(sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void) + } @@ -108,27 +108,28 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { } - public func removeProfilePic(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void) { - removeProfilePic(sessionId: sessionId, completion: completion,force: true) + public func activate(username: String, activationKey: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) { + activate(username: username, activationKey: activationKey, completion: completion,force: true) } - private func removeProfilePic(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void,force : Bool) { + private func activate(username: String, activationKey: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(sessionId , forKey: "sessionId") + params.updateValue(username , forKey: "username") + params.updateValue(activationKey , forKey: "activationKey") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/removeProfilePic", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/activate", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.removeProfilePic(sessionId: sessionId, completion: completion,force: false) + self.activate(username: username, activationKey: activationKey, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -141,21 +142,18 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { } - public func registerWithoutSubscriberType(username: String, password: String, email: String, mobile: String, registrationType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { - registerWithoutSubscriberType(username: username, password: password, email: email, mobile: mobile, registrationType: registrationType, completion: completion,force: true) + public func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { + registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: true) } - private func registerWithoutSubscriberType(username: String, password: String, email: String, mobile: String, registrationType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { + private func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(username , forKey: "username") - params.updateValue(password , forKey: "password") - params.updateValue(email , forKey: "email") params.updateValue(mobile , forKey: "mobile") - params.updateValue(registrationType , forKey: "registrationType") + params.updateValue(national_id , forKey: "national_id") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/registerWithoutSubscriberType", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/registerWithNationalId", params, completion: { (result, error) in do{ if let result = result { @@ -165,7 +163,7 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.registerWithoutSubscriberType(username: username, password: password, email: email, mobile: mobile, registrationType: registrationType, completion: completion,force: false) + self.registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -178,18 +176,21 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { } - public func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { - registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: true) + public func registerWithoutSubscriberType(username: String, password: String, email: String, mobile: String, registrationType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { + registerWithoutSubscriberType(username: username, password: password, email: email, mobile: mobile, registrationType: registrationType, completion: completion,force: true) } - private func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { + private func registerWithoutSubscriberType(username: String, password: String, email: String, mobile: String, registrationType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(username , forKey: "username") + params.updateValue(password , forKey: "password") + params.updateValue(email , forKey: "email") params.updateValue(mobile , forKey: "mobile") - params.updateValue(national_id , forKey: "national_id") + params.updateValue(registrationType , forKey: "registrationType") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/registerWithNationalId", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/registerWithoutSubscriberType", params, completion: { (result, error) in do{ if let result = result { @@ -199,7 +200,7 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: false) + self.registerWithoutSubscriberType(username: username, password: password, email: email, mobile: mobile, registrationType: registrationType, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -283,40 +284,6 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { } - public func activate(username: String, activationKey: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) { - activate(username: username, activationKey: activationKey, completion: completion,force: true) - } - - private func activate(username: String, activationKey: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(username , forKey: "username") - params.updateValue(activationKey , forKey: "activationKey") - - - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/activate", params, completion: { (result, error) in - do{ - if let result = result { - - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate - - if serviceResponse.status == PublicValue.status_success { - completion(serviceResponse,nil) - } else { - if serviceResponse.code == 401 && force { - self.activate(username: username, activationKey: activationKey, completion: completion,force: false) - }else{ - completion(serviceResponse,serviceResponse.msg) - } - } - } - }catch{ - completion(nil,"") - } - }, force,hasNounce) - } - - public func saveProfileInfo(nickName: String, firstName: String, lastName: String, fatherName: String, shenasnamehNo: String, deathStatus: String, picture: NSData, gender: String, birthDate: String, nationalId: String, data: Array>, sessionId: String,completion: @escaping (webServiceResult?,String?) -> Void) { saveProfileInfo(nickName: nickName, firstName: firstName, lastName: lastName, fatherName: fatherName, shenasnamehNo: shenasnamehNo, deathStatus: deathStatus, picture: picture, gender: gender, birthDate: birthDate, nationalId: nationalId, data: data, sessionId: sessionId, completion: completion,force: true) } @@ -1134,4 +1101,37 @@ public class SubscriberServiceV1Impl : SubscriberServiceV1 { } + public func removeProfilePic(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void) { + removeProfilePic(sessionId: sessionId, completion: completion,force: true) + } + + private func removeProfilePic(sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(sessionId , forKey: "sessionId") + + + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1/subscriber/removeProfilePic", params, completion: { (result, error) in + do{ + if let result = result { + + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_GetProfileInfoModel + + if serviceResponse.status == PublicValue.status_success { + completion(serviceResponse,nil) + } else { + if serviceResponse.code == 401 && force { + self.removeProfilePic(sessionId: sessionId, completion: completion,force: false) + }else{ + completion(serviceResponse,serviceResponse.msg) + } + } + } + }catch{ + completion(nil,"") + } + }, force,hasNounce) + } + + } diff --git a/vaslAppSdk/Classes/Module/SubscriberServiceV1_1Impl.swift b/vaslAppSdk/Classes/Module/SubscriberServiceV1_1Impl.swift index 3d7d64c..325b251 100644 --- a/vaslAppSdk/Classes/Module/SubscriberServiceV1_1Impl.swift +++ b/vaslAppSdk/Classes/Module/SubscriberServiceV1_1Impl.swift @@ -2,12 +2,12 @@ import Foundation protocol SubscriberServiceV1_1 { + func registerWithNationalId(mobile: String, national_id: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) + func echo(completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) func echoRequest(completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) - func registerWithNationalId(mobile: String, national_id: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) - } @@ -15,16 +15,18 @@ protocol SubscriberServiceV1_1 { public class SubscriberServiceV1_1Impl : SubscriberServiceV1_1 { - public func echo(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { - echo( completion: completion,force: true) + public func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { + registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: true) } - private func echo(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { - let params = Dictionary() + private func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { + var params = Dictionary() + params.updateValue(mobile , forKey: "mobile") + params.updateValue(national_id , forKey: "national_id") let hasNounce = true - RestService.post(url: PublicValue.getUrlBase() + "/api/v1.1/subscriber/echo", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v1.1/subscriber/registerWithNationalId", params, completion: { (result, error) in do{ if let result = result { @@ -34,7 +36,7 @@ public class SubscriberServiceV1_1Impl : SubscriberServiceV1_1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.echo( completion: completion,force: false) + self.registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -47,16 +49,16 @@ public class SubscriberServiceV1_1Impl : SubscriberServiceV1_1 { } - public func echoRequest(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { - echoRequest( completion: completion,force: true) + public func echo(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { + echo( completion: completion,force: true) } - private func echoRequest(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { + private func echo(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { let params = Dictionary() - let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v1.1/subscriber/echo/request", params, completion: { (result, error) in + let hasNounce = true + RestService.post(url: PublicValue.getUrlBase() + "/api/v1.1/subscriber/echo", params, completion: { (result, error) in do{ if let result = result { @@ -66,7 +68,7 @@ public class SubscriberServiceV1_1Impl : SubscriberServiceV1_1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.echoRequest( completion: completion,force: false) + self.echo( completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -79,18 +81,16 @@ public class SubscriberServiceV1_1Impl : SubscriberServiceV1_1 { } - public func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { - registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: true) + public func echoRequest(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void) { + echoRequest( completion: completion,force: true) } - private func registerWithNationalId(mobile: String, national_id: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { - var params = Dictionary() - params.updateValue(mobile , forKey: "mobile") - params.updateValue(national_id , forKey: "national_id") + private func echoRequest(completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Register?,String?) -> Void,force : Bool) { + let params = Dictionary() - let hasNounce = true - RestService.post(url: PublicValue.getUrlBase() + "/api/v1.1/subscriber/registerWithNationalId", params, completion: { (result, error) in + let hasNounce = false + RestService.post(url: PublicValue.getUrlBase() + "/api/v1.1/subscriber/echo/request", params, completion: { (result, error) in do{ if let result = result { @@ -100,7 +100,7 @@ public class SubscriberServiceV1_1Impl : SubscriberServiceV1_1 { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.registerWithNationalId(mobile: mobile, national_id: national_id, completion: completion,force: false) + self.echoRequest( completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } diff --git a/vaslAppSdk/Classes/Module/SubscriberServiceV2Impl.swift b/vaslAppSdk/Classes/Module/SubscriberServiceV2Impl.swift index 452ea7b..d64a16d 100644 --- a/vaslAppSdk/Classes/Module/SubscriberServiceV2Impl.swift +++ b/vaslAppSdk/Classes/Module/SubscriberServiceV2Impl.swift @@ -2,8 +2,18 @@ import Foundation protocol SubscriberServiceV2 { + func registerOperatorSubscriber(mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber?,String?) -> Void) + + func validateOperatorSubscriber(activationKey: String, mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void) + func addFcmToken(token: String, sessionId: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel?,String?) -> Void) + func checkUserRightel(mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel?,String?) -> Void) + + func chargeOnDemandRequest(spid: String, otpRequest: String, shortCode: String, chargeCode: String, mobileNo: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand?,String?) -> Void) + + func chargeOnDemandConfirm(spid: String, shortCode: String, mobileNo: String, otpTransactionId: String, pin: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm?,String?) -> Void) + func sendActivateCodeLater(username: String, mobile: String, email: String, activatedType: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword?,String?) -> Void) func activateLater(username: String, activationKey: String, activatedType: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) @@ -16,16 +26,6 @@ protocol SubscriberServiceV2 { func inactivateSubscriber(mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void) - func checkUserRightel(mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel?,String?) -> Void) - - func chargeOnDemandRequest(spid: String, otpRequest: String, shortCode: String, chargeCode: String, mobileNo: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand?,String?) -> Void) - - func chargeOnDemandConfirm(spid: String, shortCode: String, mobileNo: String, otpTransactionId: String, pin: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm?,String?) -> Void) - - func registerOperatorSubscriber(mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber?,String?) -> Void) - - func validateOperatorSubscriber(activationKey: String, mobile: String,completion : @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void) - } @@ -33,28 +33,27 @@ protocol SubscriberServiceV2 { public class SubscriberServiceV2Impl : SubscriberServiceV2 { - public func addFcmToken(token: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel?,String?) -> Void) { - addFcmToken(token: token, sessionId: sessionId, completion: completion,force: true) + public func registerOperatorSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber?,String?) -> Void) { + registerOperatorSubscriber(mobile: mobile, completion: completion,force: true) } - private func addFcmToken(token: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel?,String?) -> Void,force : Bool) { + private func registerOperatorSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(token , forKey: "token") - params.updateValue(sessionId , forKey: "sessionId") + params.updateValue(mobile , forKey: "mobile") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/fcm/token", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/operators/register", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.addFcmToken(token: token, sessionId: sessionId, completion: completion,force: false) + self.registerOperatorSubscriber(mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -67,30 +66,28 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func sendActivateCodeLater(username: String, mobile: String, email: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword?,String?) -> Void) { - sendActivateCodeLater(username: username, mobile: mobile, email: email, activatedType: activatedType, completion: completion,force: true) + public func validateOperatorSubscriber(activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void) { + validateOperatorSubscriber(activationKey: activationKey, mobile: mobile, completion: completion,force: true) } - private func sendActivateCodeLater(username: String, mobile: String, email: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword?,String?) -> Void,force : Bool) { + private func validateOperatorSubscriber(activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(username , forKey: "username") + params.updateValue(activationKey , forKey: "activationKey") params.updateValue(mobile , forKey: "mobile") - params.updateValue(email , forKey: "email") - params.updateValue(activatedType , forKey: "activatedType") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/send/active/code/later", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/operators/validate", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.sendActivateCodeLater(username: username, mobile: mobile, email: email, activatedType: activatedType, completion: completion,force: false) + self.validateOperatorSubscriber(activationKey: activationKey, mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -103,29 +100,28 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func activateLater(username: String, activationKey: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) { - activateLater(username: username, activationKey: activationKey, activatedType: activatedType, completion: completion,force: true) + public func addFcmToken(token: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel?,String?) -> Void) { + addFcmToken(token: token, sessionId: sessionId, completion: completion,force: true) } - private func activateLater(username: String, activationKey: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void,force : Bool) { + private func addFcmToken(token: String, sessionId: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(username , forKey: "username") - params.updateValue(activationKey , forKey: "activationKey") - params.updateValue(activatedType , forKey: "activatedType") + params.updateValue(token , forKey: "token") + params.updateValue(sessionId , forKey: "sessionId") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/active/later", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/fcm/token", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_SaveProfileInfoJsonModel if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.activateLater(username: username, activationKey: activationKey, activatedType: activatedType, completion: completion,force: false) + self.addFcmToken(token: token, sessionId: sessionId, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -138,28 +134,27 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func loginOnceTime(username: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime?,String?) -> Void) { - loginOnceTime(username: username, mobile: mobile, completion: completion,force: true) + public func checkUserRightel(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel?,String?) -> Void) { + checkUserRightel(mobile: mobile, completion: completion,force: true) } - private func loginOnceTime(username: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime?,String?) -> Void,force : Bool) { + private func checkUserRightel(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(username , forKey: "username") params.updateValue(mobile , forKey: "mobile") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/login/oncetime", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/check/user/rightel", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.loginOnceTime(username: username, mobile: mobile, completion: completion,force: false) + self.checkUserRightel(mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -172,29 +167,31 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func validatedOnceTime(username: String, activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) { - validatedOnceTime(username: username, activationKey: activationKey, mobile: mobile, completion: completion,force: true) + public func chargeOnDemandRequest(spid: String, otpRequest: String, shortCode: String, chargeCode: String, mobileNo: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand?,String?) -> Void) { + chargeOnDemandRequest(spid: spid, otpRequest: otpRequest, shortCode: shortCode, chargeCode: chargeCode, mobileNo: mobileNo, completion: completion,force: true) } - private func validatedOnceTime(username: String, activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void,force : Bool) { + private func chargeOnDemandRequest(spid: String, otpRequest: String, shortCode: String, chargeCode: String, mobileNo: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(username , forKey: "username") - params.updateValue(activationKey , forKey: "activationKey") - params.updateValue(mobile , forKey: "mobile") + params.updateValue(spid , forKey: "spid") + params.updateValue(otpRequest , forKey: "otpRequest") + params.updateValue(shortCode , forKey: "shortCode") + params.updateValue(chargeCode , forKey: "chargeCode") + params.updateValue(mobileNo , forKey: "mobileNo") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/validated/oncetime", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/request/charge/ondemand", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.validatedOnceTime(username: username, activationKey: activationKey, mobile: mobile, completion: completion,force: false) + self.chargeOnDemandRequest(spid: spid, otpRequest: otpRequest, shortCode: shortCode, chargeCode: chargeCode, mobileNo: mobileNo, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -207,27 +204,31 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func checkAllUser(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void) { - checkAllUser(mobile: mobile, completion: completion,force: true) + public func chargeOnDemandConfirm(spid: String, shortCode: String, mobileNo: String, otpTransactionId: String, pin: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm?,String?) -> Void) { + chargeOnDemandConfirm(spid: spid, shortCode: shortCode, mobileNo: mobileNo, otpTransactionId: otpTransactionId, pin: pin, completion: completion,force: true) } - private func checkAllUser(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void,force : Bool) { + private func chargeOnDemandConfirm(spid: String, shortCode: String, mobileNo: String, otpTransactionId: String, pin: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(mobile , forKey: "mobile") + params.updateValue(spid , forKey: "spid") + params.updateValue(shortCode , forKey: "shortCode") + params.updateValue(mobileNo , forKey: "mobileNo") + params.updateValue(otpTransactionId , forKey: "otpTransactionId") + params.updateValue(pin , forKey: "pin") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/check/all/user", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/confirm/charge/ondemand", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.checkAllUser(mobile: mobile, completion: completion,force: false) + self.chargeOnDemandConfirm(spid: spid, shortCode: shortCode, mobileNo: mobileNo, otpTransactionId: otpTransactionId, pin: pin, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -240,27 +241,30 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func inactivateSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void) { - inactivateSubscriber(mobile: mobile, completion: completion,force: true) + public func sendActivateCodeLater(username: String, mobile: String, email: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword?,String?) -> Void) { + sendActivateCodeLater(username: username, mobile: mobile, email: email, activatedType: activatedType, completion: completion,force: true) } - private func inactivateSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void,force : Bool) { + private func sendActivateCodeLater(username: String, mobile: String, email: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword?,String?) -> Void,force : Bool) { var params = Dictionary() + params.updateValue(username , forKey: "username") params.updateValue(mobile , forKey: "mobile") + params.updateValue(email , forKey: "email") + params.updateValue(activatedType , forKey: "activatedType") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/inactivate", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/send/active/code/later", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterUserNamePassword if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.inactivateSubscriber(mobile: mobile, completion: completion,force: false) + self.sendActivateCodeLater(username: username, mobile: mobile, email: email, activatedType: activatedType, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -273,27 +277,29 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func checkUserRightel(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel?,String?) -> Void) { - checkUserRightel(mobile: mobile, completion: completion,force: true) + public func activateLater(username: String, activationKey: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) { + activateLater(username: username, activationKey: activationKey, activatedType: activatedType, completion: completion,force: true) } - private func checkUserRightel(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel?,String?) -> Void,force : Bool) { + private func activateLater(username: String, activationKey: String, activatedType: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(mobile , forKey: "mobile") + params.updateValue(username , forKey: "username") + params.updateValue(activationKey , forKey: "activationKey") + params.updateValue(activatedType , forKey: "activatedType") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/check/user/rightel", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/active/later", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckRightel + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.checkUserRightel(mobile: mobile, completion: completion,force: false) + self.activateLater(username: username, activationKey: activationKey, activatedType: activatedType, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -306,31 +312,28 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func chargeOnDemandRequest(spid: String, otpRequest: String, shortCode: String, chargeCode: String, mobileNo: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand?,String?) -> Void) { - chargeOnDemandRequest(spid: spid, otpRequest: otpRequest, shortCode: shortCode, chargeCode: chargeCode, mobileNo: mobileNo, completion: completion,force: true) + public func loginOnceTime(username: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime?,String?) -> Void) { + loginOnceTime(username: username, mobile: mobile, completion: completion,force: true) } - private func chargeOnDemandRequest(spid: String, otpRequest: String, shortCode: String, chargeCode: String, mobileNo: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand?,String?) -> Void,force : Bool) { + private func loginOnceTime(username: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(spid , forKey: "spid") - params.updateValue(otpRequest , forKey: "otpRequest") - params.updateValue(shortCode , forKey: "shortCode") - params.updateValue(chargeCode , forKey: "chargeCode") - params.updateValue(mobileNo , forKey: "mobileNo") + params.updateValue(username , forKey: "username") + params.updateValue(mobile , forKey: "mobile") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/request/charge/ondemand", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/login/oncetime", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemand + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_LogineOnceTime if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.chargeOnDemandRequest(spid: spid, otpRequest: otpRequest, shortCode: shortCode, chargeCode: chargeCode, mobileNo: mobileNo, completion: completion,force: false) + self.loginOnceTime(username: username, mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -343,31 +346,29 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func chargeOnDemandConfirm(spid: String, shortCode: String, mobileNo: String, otpTransactionId: String, pin: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm?,String?) -> Void) { - chargeOnDemandConfirm(spid: spid, shortCode: shortCode, mobileNo: mobileNo, otpTransactionId: otpTransactionId, pin: pin, completion: completion,force: true) + public func validatedOnceTime(username: String, activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void) { + validatedOnceTime(username: username, activationKey: activationKey, mobile: mobile, completion: completion,force: true) } - private func chargeOnDemandConfirm(spid: String, shortCode: String, mobileNo: String, otpTransactionId: String, pin: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm?,String?) -> Void,force : Bool) { + private func validatedOnceTime(username: String, activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(spid , forKey: "spid") - params.updateValue(shortCode , forKey: "shortCode") - params.updateValue(mobileNo , forKey: "mobileNo") - params.updateValue(otpTransactionId , forKey: "otpTransactionId") - params.updateValue(pin , forKey: "pin") + params.updateValue(username , forKey: "username") + params.updateValue(activationKey , forKey: "activationKey") + params.updateValue(mobile , forKey: "mobile") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/confirm/charge/ondemand", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/validated/oncetime", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ChargeOnDemandConfirm + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_Activate if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.chargeOnDemandConfirm(spid: spid, shortCode: shortCode, mobileNo: mobileNo, otpTransactionId: otpTransactionId, pin: pin, completion: completion,force: false) + self.validatedOnceTime(username: username, activationKey: activationKey, mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -380,27 +381,27 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func registerOperatorSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber?,String?) -> Void) { - registerOperatorSubscriber(mobile: mobile, completion: completion,force: true) + public func checkAllUser(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void) { + checkAllUser(mobile: mobile, completion: completion,force: true) } - private func registerOperatorSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber?,String?) -> Void,force : Bool) { + private func checkAllUser(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void,force : Bool) { var params = Dictionary() params.updateValue(mobile , forKey: "mobile") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/operators/register", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/check/all/user", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_RegisterOperatorSubscriber + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.registerOperatorSubscriber(mobile: mobile, completion: completion,force: false) + self.checkAllUser(mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) } @@ -413,28 +414,27 @@ public class SubscriberServiceV2Impl : SubscriberServiceV2 { } - public func validateOperatorSubscriber(activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void) { - validateOperatorSubscriber(activationKey: activationKey, mobile: mobile, completion: completion,force: true) + public func inactivateSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void) { + inactivateSubscriber(mobile: mobile, completion: completion,force: true) } - private func validateOperatorSubscriber(activationKey: String, mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber?,String?) -> Void,force : Bool) { + private func inactivateSubscriber(mobile: String,completion: @escaping (Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser?,String?) -> Void,force : Bool) { var params = Dictionary() - params.updateValue(activationKey , forKey: "activationKey") params.updateValue(mobile , forKey: "mobile") let hasNounce = false - RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/operators/validate", params, completion: { (result, error) in + RestService.post(url: PublicValue.getUrlBase() + "/api/v2/subscriber/inactivate", params, completion: { (result, error) in do{ if let result = result { - let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_ValidateOperatorSubscriber + let serviceResponse = try Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser(serializedData: result) as Com_Vasl_Vaslapp_Modules_Subscriber_Global_Proto_Holder_CheckAllUser if serviceResponse.status == PublicValue.status_success { completion(serviceResponse,nil) } else { if serviceResponse.code == 401 && force { - self.validateOperatorSubscriber(activationKey: activationKey, mobile: mobile, completion: completion,force: false) + self.inactivateSubscriber(mobile: mobile, completion: completion,force: false) }else{ completion(serviceResponse,serviceResponse.msg) }