From dad69efea08159c719f86647c777257bb0b8b6eb Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 21 十二月 2018 15:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/U3DRepository
---
Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java | 128 ++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 55 deletions(-)
diff --git a/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 6e80665..f1ddd9f 100644
--- a/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -7,31 +7,25 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.Settings;
import android.widget.Toast;
-import com.mrcn.common.CommonMrSdk;
-import com.mrcn.sdk.callback.MrCallback;
-import com.mrcn.sdk.entity.MrError;
-import com.mrcn.sdk.entity.MrInitEntity;
+import com.allugame.freesdk.port.FreePlatform;
+import com.reyun.tracking.sdk.Tracking;
+import com.ss.android.common.applog.TeaAgent;
+import com.ss.android.common.applog.TeaConfigBuilder;
+import com.ss.android.common.lib.EventUtils;
import com.unity3d.player.UnityPlayer;
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
import java.util.HashMap;
import java.util.Map;
@@ -59,6 +53,9 @@
break;
case CodeU2A.AssetCopy:
FileUtil.copyAssets(_activity);
+ break;
+ case CodeU2A.CopyOneAsset:
+ FileUtil.copy(_activity, _json.getString("fileName"));
break;
case CodeU2A.BatteryListenStart:
BatteryUtil.getInstance().start(_activity);
@@ -88,53 +85,51 @@
case CodeU2A.RequestManifestPermissions:
break;
case CodeU2A.FreePlatformInit:
- MrPlatformUtil.getInstance().init(_activity);
+ FreePlatformUtil.getInstace().init(_activity);
break;
case CodeU2A.FreePlatformLogin:
- MrPlatformUtil.getInstance().login(_activity);
+ FreePlatformUtil.getInstace().login(_activity);
break;
case CodeU2A.FreePlatformSwitchAccount:
+ FreePlatformUtil.getInstace().switchAccount(_activity);
break;
case CodeU2A.FreePlatformLogout:
- MrPlatformUtil.getInstance().logout(_activity);
+ FreePlatformUtil.getInstace().logout();
break;
case CodeU2A.FreePlatformPay:
- JSONObject _extraData = new JSONObject();
- _extraData.put("appid",
- UniversalUtil.getMetaString(_activity, "Mr_ADID") + "_mrgame");
- _extraData.put("cpinfo", _json.getString("cpInfo"));
- _extraData.put("cporderid", _json.getString("orderId"));
-
- LogUtil.i(TAG, "=========================: " + _extraData.toString());
-
- MrPlatformUtil.getInstance().pay(_activity,
- _json.getString("cpInfo"),
- _json.getString("roleID"),
- _json.getString("roleName"),
- _json.getString("level"),
- _extraData.toString(),
- _json.getString("sid"),
- _json.getString("orderId"));
+ FreePlatformUtil.getInstace().pay(_activity,
+ _json.getString("title"),
+ _json.getString("orderId"),
+ (float) _json.getDouble("mount"),
+ _json.getString("cpInfo"));
+ FreePlatformUtil.getInstace().payProcessing = true;
break;
case CodeU2A.PayFinished:
- break;
- case CodeU2A.CreateRole:
- MrPlatformUtil.getInstance().createRole(_activity,
- _json.getString("roleID"),
- _json.getString("sid"),
- _json.getString("roleName"),
- "1",
- "0");
- break;
- case CodeU2A.RoleLogin:
- MrPlatformUtil.getInstance().enterWorld(_activity,
- _json.getString("roleID"),
- _json.getString("sid"),
- _json.getString("roleName"),
- _json.getString("level"),
- _json.getString("vipLevel"));
+ Tracking.setPayment(_json.getString("orderID"),
+ _json.getString("payType"),
+ _json.getString("moneyType"),
+ (float) _json.getDouble("money"));
+
+ int _money = (int) (_json.getDouble("money"));
+
+ EventUtils.setPurchase("",
+ "",
+ "",
+ 1,
+ _json.getString("payType"),
+ _json.getString("moneyType"),
+ true,
+ _money);
+
+ FreePlatformUtil.getInstace().payProcessing = false;
+
break;
case CodeU2A.ClientPackage:
+ // 鍒濆鍖栫儹浜�
+ Tracking.initWithKeyAndChannelId(_activity,
+ UniversalUtil.getMetaString(_activity,
+ "TrackAppID"),
+ _json.getString("clientPkgID"));
break;
case CodeU2A.JPushAddLocalMessage:
addLocalNotification(_activity,
@@ -310,9 +305,20 @@
_msgStruct.put("memoryTotal", _memoryTotal);
UniversalUtil.sendMessageToUnity(_msgStruct);
+ // ------------------------------- 鑷敱SDK -------------------------------
+ FreePlatformUtil.getInstace().init(activity);
// ------------------------------- 鏋佸厜鎺ㄩ�� -------------------------------
JPushInterface.setDebugMode(true);
JPushInterface.init(activity);
+ // ------------------------------- 浠婂ぉ澶存潯 -----------------------
+ TeaAgent.init(TeaConfigBuilder.create(activity)
+ .setAppName(UniversalUtil.getMetaString(activity,
+ "TouTiao_AppName"))
+ .setChannel(UniversalUtil.getMetaString(activity,
+ "TouTiao_Chanel"))
+ .setAid(UniversalUtil.getMetaInt(activity, "TouTiao_AppID"))
+ .createTeaConfig());
+ TeaAgent.setDebug(true);
final long _waitingTime = System.currentTimeMillis();
@@ -350,13 +356,15 @@
public static void onCreate(Activity activity, Bundle savedInstanceState)
{
- // ------------------------------- 鐚�砈DK -------------------------------
- MrPlatformUtil.getInstance().init(activity);
+ FreePlatform.getInstance().onCreate();
+ }
+
+ public static void onWindowFocusChanged(boolean b)
+ {
}
public static void onNewIntent(final Activity activity, final Intent intent)
{
- CommonMrSdk.getInstance().handleIntent(intent, activity);
}
public static void onActivityResult(int requestCode,
@@ -364,37 +372,47 @@
final Intent data,
final Activity activity)
{
- CommonMrSdk.getInstance().onActivityResult(requestCode, resultCode, data, activity);
}
public static void onConfigurationChanged(final Configuration newConfig) {}
public static void onRestart(final Activity activity)
{
- CommonMrSdk.getInstance().onRestart(activity);
}
public static void onStart(final Activity activity)
{
-
+ FreePlatform.getInstance().onStart();
}
public static void onPause(final Activity activity)
{
- CommonMrSdk.getInstance().onPause(activity);
+ FreePlatform.getInstance().onPause();
+ TeaAgent.onPause(activity);
}
public static void onResume(final Activity activity)
{
- CommonMrSdk.getInstance().onResume(activity);
+ FreePlatform.getInstance().onResume();
+ TeaAgent.onResume(activity);
+
+ if(FreePlatformUtil.getInstace().payProcessing)
+ {
+ Map<String, Object> _msgStruct = new HashMap<>();
+ _msgStruct.put("code", CodeA2U.FreePlatformPayCancel);
+ UniversalUtil.sendMessageToUnity(_msgStruct);
+ FreePlatformUtil.getInstace().payProcessing = false;
+ }
}
public static void onStop(final Activity activity)
{
- CommonMrSdk.getInstance().onStop(activity);
+ FreePlatform.getInstance().onStop();
}
public static void onDestroy(final Activity activity)
{
+ FreePlatform.getInstance().onDestory();
+ Tracking.exitSdk();
}
}
--
Gitblit v1.8.0