From 1321e4defeccfd3f7d4cae49d2061b3c5d8db8fc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 22 十一月 2023 12:16:10 +0800
Subject: [PATCH] 0312 增加切换账号，充值主线程，替换新的SdkProject/library/google-services.json但是手改包名是secondworld（观察）
---
Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar | 0
SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java | 84 +++++++++++++++++++--------
SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformLogout.java | 2
SdkProject/library/google-services.json | 51 +----------------
Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar | 0
Channel/Android/mlgtgame/AndroidManifest.xml | 1
SdkProject/channel/mlgtgame/AndroidManifest.xml | 24 ++++----
7 files changed, 75 insertions(+), 87 deletions(-)
diff --git a/Channel/Android/mlgtgame/AndroidManifest.xml b/Channel/Android/mlgtgame/AndroidManifest.xml
index 8120d12..2819e63 100644
--- a/Channel/Android/mlgtgame/AndroidManifest.xml
+++ b/Channel/Android/mlgtgame/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.unity3d.player"
diff --git a/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar b/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
index 0a9bb60..6d41e8e 100644
--- a/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
+++ b/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
Binary files differ
diff --git a/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar b/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
index aa767cd..1ab6069 100644
--- a/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
+++ b/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
Binary files differ
diff --git a/SdkProject/channel/mlgtgame/AndroidManifest.xml b/SdkProject/channel/mlgtgame/AndroidManifest.xml
index 9efe913..14d45eb 100644
--- a/SdkProject/channel/mlgtgame/AndroidManifest.xml
+++ b/SdkProject/channel/mlgtgame/AndroidManifest.xml
@@ -21,6 +21,18 @@
android:extractNativeLibs="true"
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/milu_provider_paths" />
+
+ </provider>
+
<!--閫傞厤鍏ㄩ潰灞�-->
<meta-data
android:name="android.max_aspect"
@@ -40,18 +52,6 @@
<meta-data
android:name="com.huawei.hms.client.service.name:ads-identifier"
android:value="ads-identifier:3.4.39.302" />
-
- <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/milu_provider_paths" />
-
- </provider>
-
<activity
android:name="com.maiyou.maiysdk.ui.activity.MLLoginActivity"
android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|smallestScreenSize"
diff --git a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java
index 38a20fb..214286f 100644
--- a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java
@@ -106,46 +106,78 @@
});
}
- private void LogOutInitialize() {
- //閫�鍑虹櫥褰曠殑鍥炶皟鐩戝惉
- miluSDKManager.logout(new PersonalCenterCallBack() {
+ public void LogOutInitialize() {
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
@Override
- public void getCallBack() {
- //璇峰湪姝ゅ鍋氭父鎴忛��鍑哄埌鐧诲綍椤甸潰鐨勬搷浣�
- //娉ㄩ攢鎴愬姛,闇�瑕佹妸娓告垙鍒囨崲鍥炵櫥闄嗗墠鐨勫満鏅�,骞堕噸鏂板脊鍑虹櫥褰曟绛夋搷浣�
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutOk);
+ public void run()
+ {
+ //閫�鍑虹櫥褰曠殑鍥炶皟鐩戝惉
+ miluSDKManager.logout(new PersonalCenterCallBack() {
+ @Override
+ public void getCallBack() {
+ //璇峰湪姝ゅ鍋氭父鎴忛��鍑哄埌鐧诲綍椤甸潰鐨勬搷浣�
+ //娉ㄩ攢鎴愬姛,闇�瑕佹妸娓告垙鍒囨崲鍥炵櫥闄嗗墠鐨勫満鏅�,骞堕噸鏂板脊鍑虹櫥褰曟绛夋搷浣�
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutOk);
+ }
+ });
}
});
+
}
public void pay(String roleID, String money, String serverID, String productID, String productName, String Extra) {
- miluSDKManager.showPay(GTGameMain.I.activity, money, productID, roleID, productName, productName, serverID, Extra,
- new OnPaymentListener() {
- @Override
- public void paymentSuccess(PaymentCallbackInfo callbackInfo) {
- //H5鏀粯鍥炶皟涓嶅噯锛岃鑷鏌ヨ
- }
- @Override
- public void paymentError(PaymentErrorMsg errorMsg) {
- //H5鏀粯鍥炶皟涓嶅噯锛岃鑷鏌ヨ
- }
- });
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ miluSDKManager.showPay(GTGameMain.I.activity, money, productID, roleID, productName, productName, serverID, Extra,
+ new OnPaymentListener() {
+ @Override
+ public void paymentSuccess(PaymentCallbackInfo callbackInfo) {
+ //H5鏀粯鍥炶皟涓嶅噯锛岃鑷鏌ヨ
+ }
+
+ @Override
+ public void paymentError(PaymentErrorMsg errorMsg) {
+ //H5鏀粯鍥炶皟涓嶅噯锛岃鑷鏌ヨ
+ }
+ });
+ }
+ });
+
}
public void onResume() {
- //鏄剧ず鎮诞绐�
- if (null != miluSDKManager) {
- miluSDKManager.showFloatball();
- }
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ //鏄剧ず鎮诞绐�
+ if (null != miluSDKManager) {
+ miluSDKManager.showFloatball();
+ }
+ }
+ });
+
}
public void onStop() {
- //闅愯棌鎮诞绐�
- if (null != miluSDKManager) {
- miluSDKManager.hideFloatball();
- }
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ //闅愯棌鎮诞绐�
+ if (null != miluSDKManager) {
+ miluSDKManager.hideFloatball();
+ }
+ }
+ });
}
public void onDestroy() {
diff --git a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformLogout.java b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformLogout.java
index a7135fc..14f23b8 100644
--- a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformLogout.java
+++ b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformLogout.java
@@ -1,4 +1,5 @@
package com.secondworld.sdk.command;
+import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
import org.json.JSONObject;
@@ -11,5 +12,6 @@
@Override
public void process(JSONObject json) throws Exception {
+ MySdkMgr.I.LogOutInitialize();
}
}
diff --git a/SdkProject/library/google-services.json b/SdkProject/library/google-services.json
index 87e7255..0537294 100644
--- a/SdkProject/library/google-services.json
+++ b/SdkProject/library/google-services.json
@@ -9,57 +9,12 @@
"client_info": {
"mobilesdk_app_id": "1:966789831936:android:f381abd6b3cbbf70ff67e5",
"android_client_info": {
- "package_name": "com.hhxk.djmx"
- }
- },
- "oauth_client": [
- {
- "client_id": "966789831936-5tlhorb43f1t8o4v8opughmb0ufd8ddg.apps.googleusercontent.com",
- "client_type": 1,
- "android_info": {
- "package_name": "com.hhxk.djmx",
- "certificate_hash": "ce8703d5734e0e1e6e9eb0766c6954fb1b269802"
- }
- },
- {
- "client_id": "966789831936-7kvc289ui991rool953ms9btb7dcihuv.apps.googleusercontent.com",
- "client_type": 1,
- "android_info": {
- "package_name": "com.hhxk.djmx",
- "certificate_hash": "182d414a78abee730625ac28dc5354e71e3cf27f"
- }
- },
- {
- "client_id": "966789831936-h1aps8f3s0v6rgbdu4lt2h74933m7661.apps.googleusercontent.com",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": "AIzaSyCKWCtHXjIkHtnnKcoua1yf-YXxXmrXla8"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "966789831936-h1aps8f3s0v6rgbdu4lt2h74933m7661.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
- }
- }
- },
- {
- "client_info": {
- "mobilesdk_app_id": "1:966789831936:android:9bcdeeea75060602ff67e5",
- "android_client_info": {
"package_name": "com.secondworld.sdk"
}
},
"oauth_client": [
{
- "client_id": "966789831936-3dmgiepupci14n7gh0ihsv3abqb9fnj1.apps.googleusercontent.com",
+ "client_id": "966789831936-7kvc289ui991rool953ms9btb7dcihuv.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.secondworld.sdk",
@@ -67,11 +22,11 @@
}
},
{
- "client_id": "966789831936-ifl0c6lnuroou9mpj74dkk8kphhblq56.apps.googleusercontent.com",
+ "client_id": "966789831936-9kja3dtiub1ec4bof4tta3p5virkf2ci.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.secondworld.sdk",
- "certificate_hash": "ce8703d5734e0e1e6e9eb0766c6954fb1b269802"
+ "certificate_hash": "ce8703d5734e0e1e6e9eb0766c6954fb1b2c9802"
}
},
{
--
Gitblit v1.8.0