NaverGameSDK v1.2.0 release

naver · Aug 4, 2022 · 6fb8a48 · 6fb8a48
1 parent 414436d
commit 6fb8a48
Show file tree

Hide file tree

Showing 53 changed files with 1,754 additions and 38 deletions.
diff --git a/package/NaverGameSdk-1.1.4.zip b/package/NaverGameSdk-1.1.4.zip
diff --git a/package/NaverGameSdk-1.2.0.zip b/package/NaverGameSdk-1.2.0.zip
diff --git a/sample/unreal-sample-4.23.1/Config/DefaultEngine.ini b/sample/unreal-sample-4.23.1/Config/DefaultEngine.ini
@@ -224,6 +224,7 @@ IOSTeamID=GST65JV9LK
 MinimumiOSVersion=IOS_12
 AdditionalLinkerFlags=-ObjC -lc++
 AdditionalShippingLinkerFlags=-ObjC -lc++
+AdditionalPlistData=<key>CFBundleURLTypes</key> <array>    <dict>            <key>CFBundleURLSchemes</key>           <array>               <string>gLinkSample</string>        </array>    </dict>   </array><key>NSAppTransportSecurity</key><dict><key>NSAllowsArbitraryLoads</key><true/></dict> <key>LSApplicationQueriesSchemes</key><array><string>naversearchapp</string><string>naversearchthirdlogin</string></array>    <key>CFBundleURLTypes</key><array><dict><key>CFBundleTypeRole</key><string>Editor</string><key>CFBundleURLSchemes</key><array><string>nngsdksample</string></array></dict></array><key>NSPhotoLibraryUsageDescription</key><string>Access your photos to create a post.</string>
 
 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000

diff --git a/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Content/mainMenu.uasset b/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Content/mainMenu.uasset
diff --git a/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/NaverGameSdk.uplugin b/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/NaverGameSdk.uplugin
@@ -1,7 +1,7 @@
 {
-	"FileVersion": 4,
+	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.1.4",
+	"VersionName": "1.2.0",
 	"FriendlyName": "NaverGameSdk",
 	"Description": "naver game sdk",
 	"Category": "Other",

diff --git a/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/NaverGameSdk.Build.cs b/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/NaverGameSdk.Build.cs
@@ -7,7 +7,7 @@ public class NaverGameSdk : ModuleRules
 
 	private string ThirdPartyPath
 	{
-		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../../ThirdPartyFrameworks/")); }
+		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "./ThirdPartyFrameworks/")); }
 	}
 
 	public NaverGameSdk(ReadOnlyTargetRules Target) : base(Target)
@@ -73,7 +73,15 @@ public NaverGameSdk(ReadOnlyTargetRules Target) : base(Target)
 				)
 			);
 
+			PublicAdditionalFrameworks.Add(
+                new Framework(
+					"NaverLogin",
+					"./ThirdPartyFrameworks/iOS/NaverLogin.embeddedframework.zip"
+                )
+            );
+
 			bEnableObjCExceptions = false;
+
 			PublicFrameworks.AddRange(
 				new string[]
 				{

diff --git a/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/NaverGameSdk_UPL.xml b/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/NaverGameSdk_UPL.xml
@@ -22,22 +22,15 @@
         <dumpvars/>
     </init>
     <prebuildCopies>
-        <copyFile src="$S(PluginDir)/ThirdPartyFrameworks/Android/navergame-sdk-gradle-1.1.3.aar" dst="$S(BuildDir)/gradle/app/libs/navergame-sdk-gradle-1.1.2.aar" />
+        <copyFile src="$S(PluginDir)/ThirdPartyFrameworks/Android/navergame-sdk-gradle-1.2.0.aar" dst="$S(BuildDir)/gradle/app/libs/navergame-sdk-gradle-1.2.0.aar" />
     </prebuildCopies>
     <proguardAdditions>
         <insert>
         -keep class com.navercorp.nng.android.sdk.NngNdkWrapper** { *; }
         </insert>
     </proguardAdditions>
 
-
-    <gradleProperties>
-        <insert>
-            android.useAndroidX=true
-            android.enableJetifier=true
-        </insert>
-    </gradleProperties>
-    <baseBuildGradleAdditions>
+<baseBuildGradleAdditions>
         <insert>
             allprojects {
                 def mappings = [
@@ -51,6 +44,8 @@
                 'android.arch.lifecycle.LifecycleObserver': 'androidx.lifecycle.LifecycleObserver',
                 'android.arch.lifecycle.OnLifecycleEvent': 'androidx.lifecycle.OnLifecycleEvent',
                 'android.arch.lifecycle.ProcessLifecycleOwner': 'androidx.lifecycle.ProcessLifecycleOwner',
+                'android.support.v4.app.NotificationManagerCompat' : 'androidx.core.app.NotificationManagerCompat',
+                'android.support.v4.content.FileProvider' : 'androidx.core.content.FileProvider'
                 ]
 
                 beforeEvaluate { project ->
@@ -66,17 +61,38 @@
             }
         </insert>
     </baseBuildGradleAdditions>
+
+    <gradleProperties>
+        <insert>
+            android.useAndroidX=true
+            android.enableJetifier=true
+        </insert>
+    </gradleProperties>
+    <buildGradleAdditions>
+
+        <insert>
+            android {
+                compileOptions {
+                    sourceCompatibility 1.8
+                    targetCompatibility 1.8
+                }
+            }
+
+        </insert>
+    </buildGradleAdditions>
+
     <buildGradleAdditions>
         <insert>
             dependencies {
 
-            implementation files("libs/navergame-sdk-gradle-1.1.3.aar")            // Navergame SDK
-            implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"      // Kotlin
+            implementation files("libs/navergame-sdk-gradle-1.2.0.aar")            // Navergame SDK
+            implementation "com.naver.nid:naveridlogin-android-sdk:4.2.6"       //Naver Login SDK
+            implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.20"      // Kotlin
             implementation "androidx.viewpager2:viewpager2:1.0.0"           // Viewpager2
             implementation "com.github.bumptech.glide:glide:3.7.0"          // Glide
-            implementation "com.squareup.retrofit2:retrofit:2.7.2"          // Retrofit2
+            implementation "com.squareup.retrofit2:retrofit:2.9.0"          // Retrofit2
             implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" //SwipeRefreshLayout
-            implementation "com.squareup.retrofit2:converter-gson:2.6.4"
+            implementation "com.squareup.retrofit2:converter-gson:2.9.0"
             }
         </insert>
     </buildGradleAdditions>

diff --git a/...ple-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/Android/AndroidNaverGLink.cpp b/...ple-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/Android/AndroidNaverGLink.cpp
@@ -16,6 +16,11 @@ FAndroidNaverGLink::FAndroidNaverGLink()
 		Method_StartBoard = FJavaWrapper::FindStaticMethod(Env, localGlinkClass, "startBoard", "(Landroid/app/Activity;I)V", false);
 	    Method_StartFeed = FJavaWrapper::FindStaticMethod(Env, localGlinkClass, "startFeed", "(Landroid/app/Activity;IZ)V", false);
 	    Method_GetCountryCode = FJavaWrapper::FindStaticMethod(Env, localGlinkClass,"getCountryCode", "(Landroid/app/Activity;)Ljava/lang/String;", false);
+
+		Method_SetCanWriteFeedByScreenshot = FJavaWrapper::FindStaticMethod(Env, localGlinkClass, "setEnableScreenShot", "(Z)V", false);
+		Method_StartFeedWriting = FJavaWrapper::FindStaticMethod(Env, localGlinkClass, "writeFeed", "(Landroid/app/Activity;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", false);
+		Method_SetGameId = FJavaWrapper::FindStaticMethod(Env, localGlinkClass, "setGameId", "(Landroid/app/Activity;Ljava/lang/String;)V", false);
+
 		Env->DeleteLocalRef(localGlinkClass);
 	}
 }
@@ -62,6 +67,58 @@ void FAndroidNaverGLink::Init(FString ClientId, FString ClientSecret, FString Lo
 
 }
 
+
+
+
+void FAndroidNaverGLink::SetGameId(FString GameId) const {
+    if (JNIEnv * Env = FAndroidApplication::GetJavaEnv())
+	{
+	    jclass localGlinkClass = FAndroidApplication::FindJavaClass("com.navercorp.nng.android.sdk.NngNdkWrapper"); 
+
+		jstring gameId = Env->NewStringUTF(TCHAR_TO_UTF8(*GameId));
+
+	    Env->CallStaticVoidMethod(localGlinkClass, Method_SetGameId, FJavaWrapper::GameActivityThis,gameId);
+
+
+		Env->DeleteLocalRef(gameId);
+		Env->DeleteLocalRef(localGlinkClass);
+	}
+
+}
+
+void FAndroidNaverGLink::SetCanWriteFeedByScreenshot(bool Enabled) const {
+    if (JNIEnv * Env = FAndroidApplication::GetJavaEnv())
+	{
+	    jclass localGlinkClass = FAndroidApplication::FindJavaClass("com.navercorp.nng.android.sdk.NngNdkWrapper"); 
+	    Env->CallStaticVoidMethod(localGlinkClass, Method_SetCanWriteFeedByScreenshot, Enabled);
+	    Env->DeleteLocalRef(localGlinkClass);
+	}
+
+}
+
+void FAndroidNaverGLink::StartFeedWriting(int BoardId, FString Title, FString Text, FString ImageFilePath) const {
+    if (JNIEnv * Env = FAndroidApplication::GetJavaEnv())
+	{
+	    jclass localGlinkClass = FAndroidApplication::FindJavaClass("com.navercorp.nng.android.sdk.NngNdkWrapper"); 
+
+	    jstring TitleJava = Env->NewStringUTF(TCHAR_TO_UTF8(*Title));
+        jstring TextJava = Env->NewStringUTF(TCHAR_TO_UTF8(*Text));
+        jstring ImagePathJava = Env->NewStringUTF(TCHAR_TO_UTF8(*ImageFilePath));
+
+	    Env->CallStaticVoidMethod(localGlinkClass, Method_StartFeedWriting, FJavaWrapper::GameActivityThis,BoardId,TitleJava,TextJava,ImagePathJava);
+
+
+		Env->DeleteLocalRef(TitleJava);
+        Env->DeleteLocalRef(TextJava);
+        Env->DeleteLocalRef(ImagePathJava);
+
+		Env->DeleteLocalRef(localGlinkClass);
+
+	}
+
+}
+
+
 void FAndroidNaverGLink::StartHome() const {
     if (JNIEnv * Env = FAndroidApplication::GetJavaEnv())
 	{

diff --git a/...ample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/Android/AndroidNaverGLink.h b/...ample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/Android/AndroidNaverGLink.h
@@ -15,15 +15,28 @@ class FAndroidNaverGLink : public INaverGLink
 	jmethodID Method_StartBoard;
 	jmethodID Method_StartFeed;
 	jmethodID Method_GetCountryCode;
+
+	jmethodID Method_SetCanWriteFeedByScreenshot;
+	jmethodID Method_StartFeedWriting;
+	jmethodID Method_SetGameId;
+
+
 
 public:
 	FAndroidNaverGLink();
     ~FAndroidNaverGLink();
     FString GetCountryCode() const;
 	void Init(FString ClientId, FString ClientSecret, FString LoungeId) const;
+	void SetCanWriteFeedByScreenshot(bool Enabled) const;
+    void SetGameId(FString GameId) const;
+
 	void StartHome() const;
     void StartSorry() const;
     void StartBoard(int BoardId) const;
     void StartFeed(int FeedId, bool IsTempFeedId) const;
+    void StartFeedWriting(int BoardId, FString Title, FString Text, FString ImageFilePath) const;
+
     void FinishSdk() const;
+
+
 };
diff --git a/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/GLink.cpp b/sample/unreal-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/GLink.cpp
@@ -44,3 +44,18 @@ FString UGLink::GetCountryCode()
 {
     return GetSharedSdk()->GetCountryCode();
 }
+
+void UGLink::SetCanWriteFeedByScreenshot(bool Enabled)
+{
+    GetSharedSdk()->SetCanWriteFeedByScreenshot(Enabled);
+}
+
+void UGLink::SetGameId(FString GameId)
+{
+    GetSharedSdk()->SetGameId(GameId);
+}
+
+void UGLink::ExecuteFeedWriting(int BoardId, FString Title, FString Text, FString ImageFilePath)
+{
+    GetSharedSdk()->StartFeedWriting(BoardId, Title, Text, ImageFilePath);
+}
diff --git a/...real-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/IOS/IOSNaverGLink.cpp b/...real-sample-4.23.1/Plugins/NaverGameSdk/Source/NaverGameSdk/Private/IOS/IOSNaverGLink.cpp
@@ -15,13 +15,34 @@
 #include "IOSView.h"
 
 
+static void ListenNNGSDKOpenURL(UIApplication* application, NSURL* url, NSString* sourceApplication, id annotation)
+{
+    [NNGSDKManager.shared handleCallbackUrl:url];
+}
+
 FIOSNaverGLink::FIOSNaverGLink()
 {
 }
 
+FString FIOSNaverGLink::GetCountryCode() const
+{
+    return UTF8_TO_TCHAR(NaverGLinkCallbackObject.shared.countryCode);
+}
+
 void FIOSNaverGLink::Init(FString ClientId, FString ClientSecret, FString LoungeId) const
 {
     [NaverGLinkCallbackObject.shared setClientId:ClientId.GetNSString() clientSecret:ClientSecret.GetNSString() loungeId:LoungeId.GetNSString()];
+    FIOSCoreDelegates::OnOpenURL.AddStatic(&ListenNNGSDKOpenURL);
+}
+
+void FIOSNaverGLink::SetCanWriteFeedByScreenshot(bool Enabled) const
+{
+    [NaverGLinkCallbackObject.shared setCanWriteFeedByScreenshot:Enabled];
+}
+
+void FIOSNaverGLink::SetGameId(FString GameId) const
+{
+    [NaverGLinkCallbackObject.shared setGameId:GameId.GetNSString()];
 }
 
 void FIOSNaverGLink::StartHome() const
@@ -38,13 +59,6 @@ void FIOSNaverGLink::StartSorry() const
     });
 }
 
-void FIOSNaverGLink::FinishSdk() const
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [NaverGLinkCallbackObject.shared finishSdk];
-    });
-}
-
 void FIOSNaverGLink::StartBoard(int BoardId) const
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -59,10 +73,18 @@ void FIOSNaverGLink::StartFeed(int FeedId, bool IsTempFeedId) const
     });
 }
 
+void FIOSNaverGLink::StartFeedWriting(int BoardId, FString Title, FString Text, FString ImageFilePath) const
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [NaverGLinkCallbackObject.shared startFeedWritingWithBoardId:@(BoardId) title:Title.GetNSString() text:Text.GetNSString() imageFilePath:ImageFilePath.GetNSString()];
+    });
+}
 
-FString FIOSNaverGLink::GetCountryCode() const
+void FIOSNaverGLink::FinishSdk() const
 {
-    return UTF8_TO_TCHAR(NaverGLinkCallbackObject.shared.countryCode);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [NaverGLinkCallbackObject.shared finishSdk];
+    });
 }
 
 
@@ -82,6 +104,11 @@ FString FIOSNaverGLink::GetCountryCode() const
 }
 
 
+- (NSString *)countryCode {
+    return NNGSDKManager.shared.countryCode;
+}
+
+
 - (void)setClientId:(NSString *)clientId clientSecret:(NSString *)clientSecret loungeId:(NSString *)loungeId {
     [NNGSDKManager.shared setClientId:clientId clientSecret:clientSecret loungeId:loungeId];
 }
@@ -93,6 +120,16 @@ FString FIOSNaverGLink::GetCountryCode() const
 }
 
 
+- (void)setCanWriteFeedByScreenshot:(BOOL)enabled {
+    NNGSDKManager.shared.canWriteFeedByScreenshot = enabled;
+}
+
+
+- (void)setGameId:(NSString *)gameId {
+    [NNGSDKManager.shared registerMemberGameId:gameId];
+}
+
+
 - (void)startHome {
     [NNGSDKManager.shared presentBannerViewController];
 }
@@ -103,11 +140,6 @@ FString FIOSNaverGLink::GetCountryCode() const
 }
 
 
-- (void)finishSdk {
-    [NNGSDKManager.shared dismiss];
-}
-
-
 - (void)startBoardWithBoardId:(NSNumber *)boardId {
     [NNGSDKManager.shared presentBoardViewControllerWith:boardId];
 }
@@ -118,8 +150,13 @@ FString FIOSNaverGLink::GetCountryCode() const
 }
 
 
-- (NSString *)countryCode {
-    return NNGSDKManager.shared.countryCode;
+- (void)startFeedWritingWithBoardId:(NSNumber *)boardId title:(NSString *)title text:(NSString *)text imageFilePath:(NSString *)imageFilePath {
+    [NNGSDKManager.shared presentFeedWritingWithBoardId:boardId title:title text:text imageFilePath:imageFilePath];
+}
+
+
+- (void)finishSdk {
+    [NNGSDKManager.shared dismiss];
 }