From ed173f2b05259cf7e900cecf8f5ec90e51aa4d15 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 22 五月 2024 20:15:40 +0800
Subject: [PATCH] 0312 新越南 非google sdk
---
Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar | 0
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java | 2
SdkProject/library/libs/common-release.aar | 0
SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java | 3
Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar | 0
SdkProject/library/build.gradle | 36 ++++----
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java | 2
SdkProject/library/libs/sdk_mycard-release.aar | 0
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java | 2
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java | 2
SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java | 4
/dev/null | 0
SdkProject/channel/hyyngame/AndroidManifest.xml | 68 +---------------
SdkProject/library/src/main/assets/aldsdkconf.ini | 20 +++++
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java | 2
SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java | 42 ++++++----
SdkProject/build.gradle | 2
SdkProject/library/libs/sdk_oaid-release.aar | 0
SdkProject/library/libs/sdk_res_ald-release.aar | 0
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java | 3
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java | 3
SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java | 5 -
22 files changed, 79 insertions(+), 117 deletions(-)
diff --git a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
index f7afbd6..e512119 100644
--- a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
+++ b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
Binary files differ
diff --git a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
index 27289bf..ce7f7b8 100644
--- a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
+++ b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
Binary files differ
diff --git a/SdkProject/build.gradle b/SdkProject/build.gradle
index ee9e181..6eff98e 100644
--- a/SdkProject/build.gradle
+++ b/SdkProject/build.gradle
@@ -7,9 +7,7 @@
}
dependencies {
- classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath 'com.android.tools.build:gradle:4.0.1'
- classpath 'com.google.gms:google-services:4.3.10'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module deps.gradle files
}
diff --git a/SdkProject/channel/hyyngame/AndroidManifest.xml b/SdkProject/channel/hyyngame/AndroidManifest.xml
index 18149f8..0f0dab3 100644
--- a/SdkProject/channel/hyyngame/AndroidManifest.xml
+++ b/SdkProject/channel/hyyngame/AndroidManifest.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.secondworld.sdk">
- `<!-- PROTECTION_NORMAL -->
+ <!-- PROTECTION_NORMAL -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
@@ -16,10 +16,6 @@
<!-- 鐗规畩鏉冮檺锛岄渶瑕佺敵璇� -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CAMERA" />
- <!--facebook -->
- <queries><provider android:authorities="com.facebook.katana.provider.PlatformProvider" /></queries>
-
-
<application
@@ -34,51 +30,7 @@
android:networkSecurityConfig="@xml/network_security_config"
tools:replace="android:name">
-<!-- <provider-->
-<!-- android:name="androidx.core.content.FileProvider"-->
-<!-- android:authorities="${applicationId}.fileprovider"-->
-<!-- android:exported="false"-->
-<!-- android:grantUriPermissions="true">-->
-<!-- <meta-data-->
-<!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
-<!-- android:resource="@xml/file_paths" />-->
-<!-- </provider>-->
-
- <uses-library
- android:name="org.apache.http.legacy"
- android:required="false" />
-
-
- <activity
- android:exported="false"
- android:name="com.facebook.FacebookActivity"
- android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation" />
-
- <activity
- android:name="com.facebook.CustomTabActivity"
- android:exported="true">
- <intent-filter><action android:name="android.intent.action.VIEW" />
-
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
-
- <data android:scheme="@string/fb_login_protocol_scheme" />
- </intent-filter>
- </activity>
-
- <!-- 渚嬪锛� <provider android:authorities="com.facebook.app.FacebookContentProvider123456789"-->
- <provider android:authorities="com.facebook.app.FacebookContentProvider377129091673449"
- android:name="com.facebook.FacebookContentProvider"
- android:exported="true" />
-
- <receiver
- android:name="com.appsflyer.SingleInstallBroadcastReceiver"
- android:exported="true">
- <intent-filter>
- <action android:name="com.android.vending.INSTALL_REFERRER" />
- </intent-filter>
- </receiver>
<!--SDK end-->
@@ -87,28 +39,18 @@
android:value="com.secondworld.sdk.GameActivity" />
<meta-data
android:name="ALD_GAME_CHANNELID"
- android:value="331" />
+ android:value="335" />
<meta-data
android:name="ALD_GAME_APPID"
- android:value="34"/>
+ android:value="67"/>
<meta-data
android:name="ALD_GAME_GAMEID"
android:value="1135"/>
- <!--facebook-->
- <meta-data
- android:name="com.facebook.sdk.ApplicationId"
- android:value="@string/facebook_app_id" />
- <meta-data
- android:name="com.facebook.sdk.ClientToken"
- android:value="@string/facebook_client_token"/>
- <!--搴旂敤璋锋瓕id -->
- <meta-data
- android:name="google-signin-client_id"
- android:value="572611835891-45je6quohe8267idafv3vua25cdjd10u.apps.googleusercontent.com"/>
+
<!--appflyer鍙傛暟 -->
<meta-data
android:name="appflyer-key"
- android:value="DNHmZrBYWUwuBAKf8sAhM"/>
+ android:value=""/>
</application>
</manifest>
\ No newline at end of file
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
index a7687c8..24d0924 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
@@ -1,8 +1,8 @@
package com.secondworld.sdk;
-import com.lp.overseas.sdk.AldApplication;
+import tw.com.mycard.sdk.libs.PSDKApplication;
-public class GTGameApp extends AldApplication {
+public class GTGameApp extends PSDKApplication {
@Override
public void onCreate() {
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
index cd24dfc..ed891e6 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
@@ -1,12 +1,9 @@
package com.secondworld.sdk;
import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
import android.content.Intent;
import android.view.KeyEvent;
-import androidx.annotation.NonNull;
public class GTGameMain extends GameActivityProxy {
@@ -55,7 +52,7 @@
}
@Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
MySdkMgr.I.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
index a541823..afde4eb 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
@@ -4,15 +4,13 @@
import android.content.Intent;
import android.widget.Toast;
-import androidx.annotation.NonNull;
+import com.ald.common.callback.ExtendCallBack;
+import com.ald.sdk.AldGameManger;
+import com.ald.sdk.Extend;
+import com.ald.sdk.FuncType;
+import com.ald.sdk.model.AldUserData;
-import com.lp.overseas.sdk.external.AldGameManger;
-import com.lp.overseas.sdk.external.Extend;
-import com.lp.overseas.sdk.external.callback.ExtendCallBack;
-import com.lp.overseas.sdk.external.conts.AldUserHolder;
-import com.lp.overseas.sdk.external.conts.FuncType;
-import com.lp.overseas.sdk.external.model.AldUserData;
-import com.lp.overseas.sdk.external.model.OrderInfo;
+import com.ald.sdk.model.OrderInfo;
import com.secondworld.sdk.utils.CodeA2U;
import com.secondworld.sdk.utils.LogUtil;
@@ -49,8 +47,8 @@
}
@Override
- public void onLoginFinished(AldUserData userData, AldUserHolder loginState) {
- if (loginState.getStateCode() == AldUserHolder.LOGIN_SUCCESS) {
+ public void onLoginFinished(boolean status, AldUserData userData) {
+ if (status) {
//鐧诲叆鎴愬姛
uid = userData.getUserId(); //浣滀负鍞竴鏍囩ず
String sign = userData.getSign();//鑾峰彇绛惧悕
@@ -99,6 +97,15 @@
GameActivityProxy.I.activity.finish();
} else {
//缁х画娓告垙
+ }
+ }
+
+ @Override
+ public void onPayFinished(boolean status, OrderInfo orderInfo) {
+ if (status) {
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayOk);
+ }else {
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutFail);
}
}
});
@@ -179,8 +186,7 @@
}
}
- public void onRequestPermissionsResult(int requestCode,
- @NonNull String[] permissions, @NonNull int[] grantResults) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
manger.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@@ -194,7 +200,7 @@
if (Extend.getInstance().isFunctionSupported(type)) {
Extend.getInstance().callFunctionWithParamsCallBack(GTGameMain.I.activity, type, new ExtendCallBack() {
@Override
- public void onSuccess(Object... arg0) {
+ public void onSuccess() {
//鍒嗕韩鎴愬姛
args.clear();
args.put("state", 1);
@@ -202,7 +208,7 @@
}
@Override
- public void onFailed(Object... arg0) {
+ public void onFailed() {
//鍒嗕韩澶辫触
args.clear();
args.put("state", 2);
@@ -222,13 +228,13 @@
if (Extend.getInstance().isFunctionSupported(FuncType.FANSHOME)) {
Extend.getInstance().callFunctionWithParamsCallBack(GTGameMain.I.activity, FuncType.FANSHOME, new ExtendCallBack() {
@Override
- public void onSuccess(Object... arg0) {
+ public void onSuccess() {
//璺宠綁鎴愬姛
UnityMsgHandler.sendMessageToUnity(CodeA2U.GotoFBOK);
}
@Override
- public void onFailed(Object... arg0) {
+ public void onFailed() {
}
});
@@ -242,13 +248,13 @@
if (Extend.getInstance().isFunctionSupported(FuncType.APPSTORE)) {
Extend.getInstance().callFunctionWithParamsCallBack(GTGameMain.I.activity, FuncType.APPSTORE, new ExtendCallBack() {
@Override
- public void onSuccess(Object... arg0) {
+ public void onSuccess() {
//璺宠綁鎴愬姛
UnityMsgHandler.sendMessageToUnity(CodeA2U.GotoShopOK);
}
@Override
- public void onFailed(Object... arg0) {
+ public void onFailed() {
}
});
} else {
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
index 3efdabf..4b1f09d 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
@@ -1,6 +1,6 @@
package com.secondworld.sdk.command;
-import com.lp.overseas.sdk.external.model.RoleData;
+import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
index d00a03a..907835b 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -1,6 +1,6 @@
package com.secondworld.sdk.command;
-import com.lp.overseas.sdk.external.model.OrderInfo;
+import com.ald.sdk.model.OrderInfo;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
index 1f26acb..ba4e021 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
@@ -1,7 +1,7 @@
package com.secondworld.sdk.command;
-import com.lp.overseas.sdk.external.model.RoleData;
+import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
index daac423..af39183 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
@@ -1,6 +1,6 @@
package com.secondworld.sdk.command;
-import com.lp.overseas.sdk.external.model.RoleData;
+import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
index 02f7dc9..e63c196 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
@@ -1,6 +1,6 @@
package com.secondworld.sdk.command;
-import com.lp.overseas.sdk.external.model.RoleData;
+import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 27eaed3..7e5b84d 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -1,7 +1,5 @@
plugins {
id 'com.android.library'
- id 'com.google.gms.google-services'
- id 'com.google.firebase.crashlytics'
}
def rootPath = rootProject.getRootDir().getAbsolutePath()
@@ -39,7 +37,7 @@
buildToolsVersion "33.0.0"
defaultConfig {
- minSdkVersion 24
+ minSdkVersion 21
targetSdkVersion 33
versionCode 1
versionName "1.0"
@@ -186,7 +184,7 @@
}
dependencies {
- implementation 'androidx.annotation:annotation:1.0.0'
+ //implementation 'androidx.annotation:annotation:1.0.0'
testImplementation 'junit:junit:4.13.2'
//noinspection GradleCompatible
// implementation 'com.android.support:appcompat-v7:28.0.0'
@@ -205,21 +203,25 @@
}
//浠ヤ笅涓哄繀闇�渚濊禆鐨勫簱
- implementation(name: 'lp_v', ext: 'aar') //x.x.x涓哄叿浣撶増鏈�
- implementation("com.android.billingclient:billing:5.0.0")
- implementation 'com.google.android.gms:play-services-auth:20.1.0'
- implementation 'androidx.percentlayout:percentlayout:1.0.0'
- implementation 'com.facebook.android:facebook-login:latest.release'
- implementation 'com.facebook.android:facebook-share:latest.release'
+ implementation(name: 'common-release', ext: 'aar')
+ implementation(name: 'sdk_mycard-release', ext: 'aar')
+ implementation(name: 'sdk_oaid-release', ext: 'aar')
+ implementation(name: 'sdk_res_ald-release', ext: 'aar')
+ //SDK鍩虹鑳藉姏
implementation 'com.appsflyer:af-android-sdk:6.9.0'
implementation 'com.android.installreferrer:installreferrer:2.2'
- implementation platform('com.google.firebase:firebase-bom:30.4.0') {
+ api 'androidx.annotation:annotation:1.5.0'
+ api 'androidx.core:core:1.6.0'
+ api 'androidx.percentlayout:percentlayout:1.0.0'
+ //google ID
+ implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
+ //firebase
+ implementation 'com.google.firebase:firebase-analytics'
+ implementation platform('com.google.firebase:firebase-bom:31.2.2') {
exclude group: 'com.android.support', module: 'support-compat'
}
- implementation 'com.google.android.play:review:2.0.1'
- implementation 'com.google.firebase:firebase-analytics'
- implementation 'com.navercorp.nid:oauth-jdk8:5.1.1'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
- implementation 'com.google.android.play:review:2.0.1'
- implementation 'com.google.firebase:firebase-crashlytics:18.2.9'
+ //base theme
+ api 'androidx.appcompat:appcompat:1.2.0'
+ //ald ui鐢�
+ api 'androidx.cardview:cardview:1.0.0'
}
diff --git a/SdkProject/library/libs/common-release.aar b/SdkProject/library/libs/common-release.aar
new file mode 100644
index 0000000..3a1d8c5
--- /dev/null
+++ b/SdkProject/library/libs/common-release.aar
Binary files differ
diff --git a/SdkProject/library/libs/lp_v.aar b/SdkProject/library/libs/lp_v.aar
deleted file mode 100644
index 8f65ca2..0000000
--- a/SdkProject/library/libs/lp_v.aar
+++ /dev/null
Binary files differ
diff --git a/SdkProject/library/libs/sdk_mycard-release.aar b/SdkProject/library/libs/sdk_mycard-release.aar
new file mode 100644
index 0000000..e45e07b
--- /dev/null
+++ b/SdkProject/library/libs/sdk_mycard-release.aar
Binary files differ
diff --git a/SdkProject/library/libs/sdk_oaid-release.aar b/SdkProject/library/libs/sdk_oaid-release.aar
new file mode 100644
index 0000000..41b8af2
--- /dev/null
+++ b/SdkProject/library/libs/sdk_oaid-release.aar
Binary files differ
diff --git a/SdkProject/library/libs/sdk_res_ald-release.aar b/SdkProject/library/libs/sdk_res_ald-release.aar
new file mode 100644
index 0000000..935684f
--- /dev/null
+++ b/SdkProject/library/libs/sdk_res_ald-release.aar
Binary files differ
diff --git a/SdkProject/library/src/main/assets/aldsdkconf.ini b/SdkProject/library/src/main/assets/aldsdkconf.ini
new file mode 100644
index 0000000..c80d3a7
--- /dev/null
+++ b/SdkProject/library/src/main/assets/aldsdkconf.ini
@@ -0,0 +1,20 @@
+锘�;**************娓告垙鐩稿叧閰嶇疆, 娓告垙闇�瑕佹牴鎹悇鑷儏鍐典慨鏀� START **********
+;娓告垙鐨凜HANNELID
+GAME_CHANNELID=335
+
+;娓告垙鐨凙PPID
+GAME_APPID=67
+
+;娓告垙鐨凣AMEID
+GAME_GAMEID=1135
+
+;************** 绗笁鏂圭浉鍏抽厤缃」,娓告垙闇�瑕佹牴鎹垜鏂硅繍钀ユ彁渚涘弬鏁版儏鍐典慨鏀� END **************
+SDK_GOOGLE=false
+SDK_MC=true
+SDK_HW=false
+;璋锋瓕ID锛屼笂璋锋瓕蹇呭～
+google-signin-client_id=172660406541-f7uugubkoh88vcl8bbl9bq99u5vrhq23.apps.googleusercontent.com
+;鏁版嵁涓婃姤寮�鍏筹紙appsflyer,firebase锛夛紝闄よ胺姝岄渶姹傚寘浠ュ閮藉叧
+ADVERT_REPORT_SWITCH=false
+;af鐨刱ey
+APPSFLYER_KEY=QhtrMVJakDPsv3zEZ2LJnE
\ No newline at end of file
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
index e0ec873..a1ac193 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
@@ -6,7 +6,6 @@
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
-import androidx.annotation.NonNull;
import com.secondworld.sdk.utils.LogUtil;
import com.secondworld.sdk.utils.WebViewUtil;
@@ -104,7 +103,7 @@
}
@Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (proxy != null)
proxy.onRequestPermissionsResult(requestCode, permissions, grantResults);
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
index fb9245f..69c9a73 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
@@ -2,7 +2,6 @@
import android.app.Activity;
import android.content.Intent;
-import androidx.annotation.NonNull;
import android.view.KeyEvent;
@@ -52,7 +51,7 @@
}
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
PermissionManager.I.onRequestPermissionsResult(activity, requestCode, permissions, grantResults);
}
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java b/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
index 1a1fd09..60fbfb2 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
@@ -3,7 +3,6 @@
import android.app.Activity;
import android.content.pm.PackageManager;
-import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.content.PermissionChecker;
@@ -43,7 +42,7 @@
}
- public void onRequestPermissionsResult(Activity activity, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ public void onRequestPermissionsResult(Activity activity, int requestCode, String[] permissions, int[] grantResults) {
if (activity == null || permissions.length == 0 || requestCode != RequestCode.UNITY)
return;
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0