From b09a15acd68ac1257f466b46e96d9132b6a0f85d Mon Sep 17 00:00:00 2001
From: allez <305670599@qq.com>
Date: 星期四, 18 三月 2021 17:51:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository
---
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java b/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java
index 567ecab..f1cce9d 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java
@@ -3,7 +3,8 @@
import android.app.AlertDialog;
-import com.secondworld.sdk.GameApp;
+import com.secondworld.sdk.GameAppProxy;
+import com.secondworld.sdk.PlatformDiff;
import com.secondworld.sdk.UnityMsgHandler;
import com.secondworld.sdk.utils.CodeA2U;
import com.secondworld.sdk.utils.CodeU2A;
@@ -11,6 +12,7 @@
import com.secondworld.sdk.utils.LogUtil;
import com.unity3d.player.UnityPlayer;
+import org.json.JSONException;
import org.json.JSONObject;
import java.util.HashMap;
@@ -28,7 +30,9 @@
}
@Override
- public void process(JSONObject json) {
+ public void process(JSONObject json) throws JSONException {
+ GameAppProxy.appId = json.getString("appID");
+
long size = DeviceUtil.getTotalRAMSize() / 1024 / 1024;
LogUtil.debug("CmdInit", "鍐呭瓨锛�" + size + " mb");
if (size < 1024) {
@@ -38,25 +42,24 @@
_builder.setCancelable(false);
_builder.setMessage("鎮ㄧ殑璁惧杩愯鍐呭瓨涓嶆弧瓒宠姹�,鏃犳硶姝ｅ父杩愯娓告垙");
_builder.setPositiveButton("纭畾", (dialogInterface, i) -> {
- GameApp.I.appExit();
+ GameAppProxy.appExit();
});
_builder.show();
return;
}
//鍙戦�佽澶囦俊鎭�
Map<String, Object> _msgStruct = new HashMap<>();
- _msgStruct.put("code", CodeA2U.DeviceInfo);
_msgStruct.put("userAgent", System.getProperty("http.agent"));
_msgStruct.put("mac", DeviceUtil.getLocalMac());
_msgStruct.put("imei", "");
_msgStruct.put("android_id", DeviceUtil.getAndroidId());
_msgStruct.put("unique_id", DeviceUtil.getUniqueID());
_msgStruct.put("memoryTotal", size);
- UnityMsgHandler.sendMessageToUnity(_msgStruct);
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.DeviceInfo,_msgStruct);
//閫氱煡sdk鍒濆鍖栧畬鎴�
_msgStruct.clear();
- _msgStruct.put("code", CodeA2U.SdkInitComplete);
- UnityMsgHandler.sendMessageToUnity(_msgStruct);
+ _msgStruct.put("channelPlatform", PlatformDiff.I.platformName());
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.SdkInitComplete,_msgStruct);
LogUtil.debug("CmdInit", "Sdk鍒濆鍖栧畬鎴�");
}
}
--
Gitblit v1.8.0