Merge branch 'master' of https://git.thecodeway.com/jinchao/TurboLinkTest

Client/Source/TurboLinkTest/TimeTestWidget.cpp

@@ -65,7 +65,7 @@ void UTimeTestWidget::UpdateControlState()
 void UTimeTestWidget::OnConnectServiceButtonClicked()
 {
     if (TimeService != nullptr) return;
-    UTurboLinkGrpcManager* turboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager();
+    UTurboLinkGrpcManager* turboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager(this);
 
     //create service adapter
     TimeService = Cast<UTimeService>(turboLinkManager->MakeService("TimeService"));
@@ -93,7 +93,7 @@ void UTimeTestWidget::OnShutdownServiceButtonClicked()
         }
 
         TimeService->OnServiceStateChanged.RemoveDynamic(this, &UTimeTestWidget::OnTimeServiceStateChanged);
-        UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager()->ReleaseService(TimeService);
+        UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager(this)->ReleaseService(TimeService);
         TimeService = nullptr;
 
         UpdateControlState();

Client/Source/TurboLinkTest/TurboLinkTestController.cpp

@@ -30,7 +30,7 @@ void ATurboLinkTestController::GetLifetimeReplicatedProps(TArray <FLifetimePrope
 void ATurboLinkTestController::ConnectToTimeService_Implementation()
 {
     if (TimeService != nullptr) return;
-    UTurboLinkGrpcManager* turboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager();
+    UTurboLinkGrpcManager* turboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager(this);
 
     //create service adapter
     TimeService = Cast<UTimeService>(turboLinkManager->MakeService("TimeService"));
@@ -58,7 +58,7 @@ void ATurboLinkTestController::ShutdownTimeService_Implementation()
         }
 
         TimeService->OnServiceStateChanged.RemoveDynamic(this, &ATurboLinkTestController::OnTimeServiceStateChanged);
-        UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager()->ReleaseService(TimeService);
+        UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager(this)->ReleaseService(TimeService);
         TimeService = nullptr;
 
         bIsClientCreated = false;

Client/Source/TurboLinkTest/TurboLinkTestGameInstance.cpp

@@ -8,16 +8,11 @@
 void UTurboLinkTestGameInstance::Init()
 {
     Super::Init();
-
-    TurboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager();
-    TurboLinkManager->InitManager();
 }
 
 void UTurboLinkTestGameInstance::Shutdown()
 {
-    // Unregister ticker delegate
+    Super::Shutdown();
-    TurboLinkManager->Shutdown();
-    TurboLinkManager = nullptr;
 }
 
 FString UTurboLinkTestGameInstance::DumpBytes(const FBytes& Bytes)

Client/Source/TurboLinkTest/TurboLinkTestGameInstance.h

@@ -25,8 +25,4 @@ public:
 	void DumpMessage(const FGrpcUserRegisterRequest& Message);
 protected:
 	FString DumpBytes(const FBytes& Bytes);
-
-protected:
-	UPROPERTY()
-	UTurboLinkGrpcManager* TurboLinkManager;
 };